aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/e1000_ethtool.c4
-rw-r--r--drivers/net/e1000/e1000_main.c2
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 2a3b2dccd06d..d5ff029aa7b2 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -1015,8 +1015,6 @@ static void e1000_free_desc_rings(struct e1000_adapter *adapter)
1015 txdr->buffer_info = NULL; 1015 txdr->buffer_info = NULL;
1016 kfree(rxdr->buffer_info); 1016 kfree(rxdr->buffer_info);
1017 rxdr->buffer_info = NULL; 1017 rxdr->buffer_info = NULL;
1018
1019 return;
1020} 1018}
1021 1019
1022static int e1000_setup_desc_rings(struct e1000_adapter *adapter) 1020static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
@@ -1711,8 +1709,6 @@ static void e1000_get_wol(struct net_device *netdev,
1711 wol->wolopts |= WAKE_BCAST; 1709 wol->wolopts |= WAKE_BCAST;
1712 if (adapter->wol & E1000_WUFC_MAG) 1710 if (adapter->wol & E1000_WUFC_MAG)
1713 wol->wolopts |= WAKE_MAGIC; 1711 wol->wolopts |= WAKE_MAGIC;
1714
1715 return;
1716} 1712}
1717 1713
1718static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 1714static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 4dd2c23775cb..f06c8975f886 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2546,8 +2546,6 @@ set_itr_now:
2546 adapter->itr = new_itr; 2546 adapter->itr = new_itr;
2547 ew32(ITR, 1000000000 / (new_itr * 256)); 2547 ew32(ITR, 1000000000 / (new_itr * 256));
2548 } 2548 }
2549
2550 return;
2551} 2549}
2552 2550
2553#define E1000_TX_FLAGS_CSUM 0x00000001 2551#define E1000_TX_FLAGS_CSUM 0x00000001