leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r8169: adjust __rtl8169_set_features

Browse Source 
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: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
hayeswang 2014-09-16 11:40:47 +08:00 committed by David S. Miller
parent 95cd6f488d
commit 929a031dfd
1 changed files with 34 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
drivers/net/ethernet/realtek/r8169.c
View File

@ -1783,33 +1783,31 @@ static void __rtl8169_set_features(struct net_device *dev,
netdev_features_t features) netdev_features_t features)
{ {
struct rtl8169_private *tp = netdev_priv(dev); struct rtl8169_private *tp = netdev_priv(dev);
netdev_features_t changed = features ^ dev->features;
void __iomem *ioaddr = tp->mmio_addr; void __iomem *ioaddr = tp->mmio_addr;
u32 rx_config;
if (!(changed & (NETIF_F_RXALL | NETIF_F_RXCSUM | rx_config = RTL_R32(RxConfig);
NETIF_F_HW_VLAN_CTAG_RX))) if (features & NETIF_F_RXALL)
return; rx_config |= (AcceptErr | AcceptRunt);
else
rx_config &= ~(AcceptErr | AcceptRunt);
if (changed & (NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_RX)) { RTL_W32(RxConfig, rx_config);
if (features & NETIF_F_RXCSUM)
tp->cp_cmd |= RxChkSum;
else
tp->cp_cmd &= ~RxChkSum;
if (features & NETIF_F_HW_VLAN_CTAG_RX) if (features & NETIF_F_RXCSUM)
tp->cp_cmd |= RxVlan; tp->cp_cmd |= RxChkSum;
else else
tp->cp_cmd &= ~RxVlan; tp->cp_cmd &= ~RxChkSum;
RTL_W16(CPlusCmd, tp->cp_cmd); if (features & NETIF_F_HW_VLAN_CTAG_RX)
RTL_R16(CPlusCmd); tp->cp_cmd |= RxVlan;
} else
if (changed & NETIF_F_RXALL) { tp->cp_cmd &= ~RxVlan;
int tmp = (RTL_R32(RxConfig) & ~(AcceptErr | AcceptRunt));
if (features & NETIF_F_RXALL) tp->cp_cmd |= RTL_R16(CPlusCmd) & ~(RxVlan | RxChkSum);
tmp |= (AcceptErr | AcceptRunt);
RTL_W32(RxConfig, tmp); RTL_W16(CPlusCmd, tp->cp_cmd);
} RTL_R16(CPlusCmd);
} }
static int rtl8169_set_features(struct net_device *dev, static int rtl8169_set_features(struct net_device *dev,
@ -1817,8 +1815,11 @@ static int rtl8169_set_features(struct net_device *dev,
{ {
struct rtl8169_private *tp = netdev_priv(dev); struct rtl8169_private *tp = netdev_priv(dev);
features &= NETIF_F_RXALL | NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_RX;
rtl_lock_work(tp); rtl_lock_work(tp);
__rtl8169_set_features(dev, features); if (features ^ dev->features);
__rtl8169_set_features(dev, features);
rtl_unlock_work(tp); rtl_unlock_work(tp);
return 0; return 0;
@ -6707,12 +6708,7 @@ static int rtl_open(struct net_device *dev)
rtl8169_init_phy(dev, tp); rtl8169_init_phy(dev, tp);
if (dev->features & NETIF_F_HW_VLAN_CTAG_RX) __rtl8169_set_features(dev, dev->features);
tp->cp_cmd |= RxVlan;
else
tp->cp_cmd &= ~RxVlan;
RTL_W16(CPlusCmd, tp->cp_cmd);
rtl_pll_power_up(tp); rtl_pll_power_up(tp);
@ -7123,8 +7119,7 @@ static void rtl_hw_initialize(struct rtl8169_private *tp)
} }
} }
static int static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
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 struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data;
const unsigned int region = cfg->region; 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; goto err_out_mwi_2;
} }
tp->cp_cmd = RxChkSum; tp->cp_cmd = 0;
if ((sizeof(dma_addr_t) > 4) && if ((sizeof(dma_addr_t) > 4) &&
!pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) && use_dac) { !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); 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_mdio_ops(tp);
rtl_init_pll_power_ops(tp); rtl_init_pll_power_ops(tp);
rtl_init_jumbo_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 | dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
NETIF_F_HIGHDMA; 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) 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; dev->hw_features &= ~NETIF_F_HW_VLAN_CTAG_RX;
if (tp->txd_version == RTL_TD_0) if (tp->txd_version == RTL_TD_0)