Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 929a031d authored by hayeswang's avatar hayeswang Committed by David S. Miller
Browse files

r8169: adjust __rtl8169_set_features 



Remove the "changed" test in __rtl8169_set_features(). Instead, do
simple test in rtl8169_set_features().

Set the RxChkSum and RxVlan through __rtl8169_set_features() in
rtl_open().

Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 95cd6f48

drivers/net/ethernet/realtek/r8169.c

+34 −40
Original line number Diff line number Diff line
@@ -1783,14 +1783,17 @@ static void __rtl8169_set_features(struct net_device *dev, 
				   netdev_features_t features)

{

	struct rtl8169_private *tp = netdev_priv(dev);

	netdev_features_t changed = features ^ dev->features;

	void __iomem *ioaddr = tp->mmio_addr;

	u32 rx_config;



	if (!(changed & (NETIF_F_RXALL | NETIF_F_RXCSUM |

			 NETIF_F_HW_VLAN_CTAG_RX)))

		return;

	rx_config = RTL_R32(RxConfig);

	if (features & NETIF_F_RXALL)

		rx_config |= (AcceptErr | AcceptRunt);

	else

		rx_config &= ~(AcceptErr | AcceptRunt);



	RTL_W32(RxConfig, rx_config);



	if (changed & (NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_RX)) {

	if (features & NETIF_F_RXCSUM)

		tp->cp_cmd |= RxChkSum;

	else
@@ -1801,23 +1804,21 @@ static void __rtl8169_set_features(struct net_device *dev, 
	else

		tp->cp_cmd &= ~RxVlan;



	tp->cp_cmd |= RTL_R16(CPlusCmd) & ~(RxVlan | RxChkSum);



	RTL_W16(CPlusCmd, tp->cp_cmd);

	RTL_R16(CPlusCmd);

}

	if (changed & NETIF_F_RXALL) {

		int tmp = (RTL_R32(RxConfig) & ~(AcceptErr | AcceptRunt));

		if (features & NETIF_F_RXALL)

			tmp |= (AcceptErr | AcceptRunt);

		RTL_W32(RxConfig, tmp);

	}

}



static int rtl8169_set_features(struct net_device *dev,

				netdev_features_t features)

{

	struct rtl8169_private *tp = netdev_priv(dev);



	features &= NETIF_F_RXALL | NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_RX;



	rtl_lock_work(tp);

	if (features ^ dev->features);

		__rtl8169_set_features(dev, features);

	rtl_unlock_work(tp);
@@ -6707,12 +6708,7 @@ static int rtl_open(struct net_device *dev) 


	rtl8169_init_phy(dev, tp);



	if (dev->features & NETIF_F_HW_VLAN_CTAG_RX)

		tp->cp_cmd |= RxVlan;

	else

		tp->cp_cmd &= ~RxVlan;



	RTL_W16(CPlusCmd, tp->cp_cmd);

	__rtl8169_set_features(dev, dev->features);



	rtl_pll_power_up(tp);
@@ -7123,8 +7119,7 @@ static void rtl_hw_initialize(struct rtl8169_private *tp) 
	}

}



static int

rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data;

	const unsigned int region = cfg->region;
@@ -7199,7 +7194,7 @@ rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_out_mwi_2;

	}



	tp->cp_cmd = RxChkSum;

	tp->cp_cmd = 0;



	if ((sizeof(dma_addr_t) > 4) &&

	    !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) && use_dac) {
@@ -7240,13 +7235,6 @@ rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 


	pci_set_master(pdev);



	/*

	 * Pretend we are using VLANs; This bypasses a nasty bug where

	 * Interrupts stop flowing on high load on 8110SCd controllers.

	 */

	if (tp->mac_version == RTL_GIGA_MAC_VER_05)

		tp->cp_cmd |= RxVlan;



	rtl_init_mdio_ops(tp);

	rtl_init_pll_power_ops(tp);

	rtl_init_jumbo_ops(tp);
@@ -7307,8 +7295,14 @@ rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |

		NETIF_F_HIGHDMA;



	tp->cp_cmd |= RxChkSum | RxVlan;



	/*

	 * Pretend we are using VLANs; This bypasses a nasty bug where

	 * Interrupts stop flowing on high load on 8110SCd controllers.

	 */

	if (tp->mac_version == RTL_GIGA_MAC_VER_05)

		/* 8110SCd requires hardware Rx VLAN - disallow toggling */

		/* Disallow toggling */

		dev->hw_features &= ~NETIF_F_HW_VLAN_CTAG_RX;



	if (tp->txd_version == RTL_TD_0)