X-Git-Url: https://bbs.cooldavid.org/git/?a=blobdiff_plain;f=jme.c;h=2695a8e324e2a05ff1a9ac2a6898e648f0ed4764;hb=1ec30a25c1db288161d0fa8893d985fa20bcdb07;hp=9da34cb4fb6304d0423a48e24b9dc4060684605d;hpb=1eef180c6c36524255aee362949a54232548f979;p=jme.git

diff --git a/jme.c b/jme.c
index 9da34cb..2695a8e 100644
--- a/jme.c
+++ b/jme.c
@@ -1099,6 +1099,7 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)
 			skb_checksum_none_assert(skb);
 #endif
 
+#ifndef __UNIFY_VLAN_RX_PATH__
 		if (rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_TAGON)) {
 			if (jme->vlgrp) {
 				jme->jme_vlan_rx(skb, jme->vlgrp,
@@ -1110,6 +1111,15 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)
 		} else {
 			jme->jme_rx(skb);
 		}
+#else
+		if (rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_TAGON)) {
+			u16 vid = le16_to_cpu(rxdesc->descwb.vlan);
+
+			__vlan_hwaccel_put_tag(skb, vid);
+			NET_STAT(jme).rx_bytes += 4;
+		}
+		jme->jme_rx(skb);
+#endif
 
 		if ((rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_DEST)) ==
 		    cpu_to_le16(RXWBFLAG_DEST_MUL))
@@ -2343,6 +2353,7 @@ jme_change_mtu(struct net_device *netdev, int new_mtu)
 		jme_restart_rx_engine(jme);
 	}
 
+#ifndef __USE_NDO_FIX_FEATURES__
 	if (new_mtu > 1900) {
 		netdev->features &= ~(NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
 				NETIF_F_TSO | NETIF_F_TSO6);
@@ -2352,8 +2363,12 @@ jme_change_mtu(struct net_device *netdev, int new_mtu)
 		if (test_bit(JME_FLAG_TSO, &jme->flags))
 			netdev->features |= NETIF_F_TSO | NETIF_F_TSO6;
 	}
+#endif
 
 	netdev->mtu = new_mtu;
+#ifdef __USE_NDO_FIX_FEATURES__
+	netdev_update_features(netdev);
+#endif
 	jme_reset_link(jme);
 
 	return 0;
@@ -2406,6 +2421,7 @@ static inline void jme_resume_rx(struct jme_adapter *jme)
 	atomic_inc(&jme->link_changing);
 }
 
+#ifndef __UNIFY_VLAN_RX_PATH__
 static void
 jme_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
 {
@@ -2415,6 +2431,7 @@ jme_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
 	jme->vlgrp = grp;
 	jme_resume_rx(jme);
 }
+#endif
 
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,21)
 static void
@@ -2544,7 +2561,9 @@ jme_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ecmd)
 	    test_bit(JME_FLAG_POLL, &jme->flags)) {
 		clear_bit(JME_FLAG_POLL, &jme->flags);
 		jme->jme_rx = netif_rx;
+#ifndef __UNIFY_VLAN_RX_PATH__
 		jme->jme_vlan_rx = vlan_hwaccel_rx;
+#endif
 		dpi->cur		= PCC_P1;
 		dpi->attempt		= PCC_P1;
 		dpi->cnt		= 0;
@@ -2554,7 +2573,9 @@ jme_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ecmd)
 		   !(test_bit(JME_FLAG_POLL, &jme->flags))) {
 		set_bit(JME_FLAG_POLL, &jme->flags);
 		jme->jme_rx = netif_receive_skb;
+#ifndef __UNIFY_VLAN_RX_PATH__
 		jme->jme_vlan_rx = vlan_hwaccel_receive_skb;
+#endif
 		jme_interrupt_mode(jme);
 	}
 
@@ -2775,6 +2796,7 @@ jme_set_msglevel(struct net_device *netdev, u32 value)
 	jme->msg_enable = value;
 }
 
+#ifndef __USE_NDO_FIX_FEATURES__
 static u32
 jme_get_rx_csum(struct net_device *netdev)
 {
@@ -2833,6 +2855,31 @@ jme_set_tso(struct net_device *netdev, u32 on)
 
 	return 0;
 }
+#else
+static u32
+jme_fix_features(struct net_device *netdev, u32 features)
+{
+	if (netdev->mtu > 1900)
+		features &= ~(NETIF_F_ALL_TSO | NETIF_F_ALL_CSUM);
+	return features;
+}
+
+static int
+jme_set_features(struct net_device *netdev, u32 features)
+{
+	struct jme_adapter *jme = netdev_priv(netdev);
+
+	spin_lock_bh(&jme->rxmcs_lock);
+	if (features & NETIF_F_RXCSUM)
+		jme->reg_rxmcs |= RXMCS_CHECKSUM;
+	else
+		jme->reg_rxmcs &= ~RXMCS_CHECKSUM;
+	jwrite32(jme, JME_RXMCS, jme->reg_rxmcs);
+	spin_unlock_bh(&jme->rxmcs_lock);
+
+	return 0;
+}
+#endif
 
 static int
 jme_nway_reset(struct net_device *netdev)
@@ -2979,11 +3026,13 @@ static const struct ethtool_ops jme_ethtool_ops = {
 	.get_link		= jme_get_link,
 	.get_msglevel           = jme_get_msglevel,
 	.set_msglevel           = jme_set_msglevel,
+#ifndef __USE_NDO_FIX_FEATURES__
 	.get_rx_csum		= jme_get_rx_csum,
 	.set_rx_csum		= jme_set_rx_csum,
 	.set_tx_csum		= jme_set_tx_csum,
 	.set_tso		= jme_set_tso,
 	.set_sg			= ethtool_op_set_sg,
+#endif
 	.nway_reset             = jme_nway_reset,
 	.get_eeprom_len		= jme_get_eeprom_len,
 	.get_eeprom		= jme_get_eeprom,
@@ -3063,10 +3112,20 @@ static const struct net_device_ops jme_netdev_ops = {
 	.ndo_do_ioctl		= jme_ioctl,
 	.ndo_start_xmit		= jme_start_xmit,
 	.ndo_set_mac_address	= jme_set_macaddr,
+#ifndef __USE_NDO_SET_RX_MODE__
 	.ndo_set_multicast_list	= jme_set_multi,
+#else
+	.ndo_set_rx_mode	= jme_set_multi,
+#endif
 	.ndo_change_mtu		= jme_change_mtu,
 	.ndo_tx_timeout		= jme_tx_timeout,
+#ifndef __UNIFY_VLAN_RX_PATH__
 	.ndo_vlan_rx_register	= jme_vlan_rx_register,
+#endif
+#ifdef __USE_NDO_FIX_FEATURES__
+	.ndo_fix_features       = jme_fix_features,
+	.ndo_set_features       = jme_set_features,
+#endif
 };
 #endif
 
@@ -3138,6 +3197,14 @@ jme_init_one(struct pci_dev *pdev,
 #endif
 	netdev->ethtool_ops		= &jme_ethtool_ops;
 	netdev->watchdog_timeo		= TX_TIMEOUT;
+#ifdef __USE_NDO_FIX_FEATURES__
+	netdev->hw_features		=	NETIF_F_IP_CSUM |
+						NETIF_F_IPV6_CSUM |
+						NETIF_F_SG |
+						NETIF_F_TSO |
+						NETIF_F_TSO6 |
+						NETIF_F_RXCSUM;
+#endif
 	netdev->features		=	NETIF_F_IP_CSUM |
 						NETIF_F_IPV6_CSUM |
 						NETIF_F_SG |
@@ -3158,7 +3225,9 @@ jme_init_one(struct pci_dev *pdev,
 	jme->pdev = pdev;
 	jme->dev = netdev;
 	jme->jme_rx = netif_rx;
+#ifndef __UNIFY_VLAN_RX_PATH__
 	jme->jme_vlan_rx = vlan_hwaccel_rx;
+#endif
 	jme->old_mtu = netdev->mtu = 1500;
 	jme->phylink = 0;
 	jme->tx_ring_size = 1 << 10;
@@ -3221,8 +3290,14 @@ jme_init_one(struct pci_dev *pdev,
 	jme->reg_txpfc = 0;
 	jme->reg_pmcs = PMCS_MFEN;
 	jme->reg_gpreg1 = GPREG1_DEFAULT;
+#ifndef __USE_NDO_FIX_FEATURES__
 	set_bit(JME_FLAG_TXCSUM, &jme->flags);
 	set_bit(JME_FLAG_TSO, &jme->flags);
+#else
+
+	if (jme->reg_rxmcs & RXMCS_CHECKSUM)
+		netdev->features |= NETIF_F_RXCSUM;
+#endif
 
 	/*
 	 * Get Max Read Req Size from PCI Config Space