diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-08-18 15:56:42 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-08-18 15:56:47 -0400 |
commit | 8bc84f87315e8bdbe242ba788fdc6a74d653b177 (patch) | |
tree | b96fef5c82de40cb2a5bfe6f29699f1c820513cd /drivers/net/e1000e/netdev.c | |
parent | 18e5a45db30e0e338cdd663eda05a8288cc14fa5 (diff) | |
parent | fe4c51b22080691792d3e28d86acb4d4ccb7e8e8 (diff) |
Merge branch 'perf/urgent' into perf/core
Merge reason: add the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index ab4be80f7ab5..362f70382cdd 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -56,7 +56,7 @@ | |||
56 | 56 | ||
57 | #define DRV_EXTRAVERSION "-k" | 57 | #define DRV_EXTRAVERSION "-k" |
58 | 58 | ||
59 | #define DRV_VERSION "1.3.16" DRV_EXTRAVERSION | 59 | #define DRV_VERSION "1.4.4" DRV_EXTRAVERSION |
60 | char e1000e_driver_name[] = "e1000e"; | 60 | char e1000e_driver_name[] = "e1000e"; |
61 | const char e1000e_driver_version[] = DRV_VERSION; | 61 | const char e1000e_driver_version[] = DRV_VERSION; |
62 | 62 | ||
@@ -2915,7 +2915,8 @@ static void e1000_configure_rx(struct e1000_adapter *adapter) | |||
2915 | 2915 | ||
2916 | /* disable receives while setting up the descriptors */ | 2916 | /* disable receives while setting up the descriptors */ |
2917 | rctl = er32(RCTL); | 2917 | rctl = er32(RCTL); |
2918 | ew32(RCTL, rctl & ~E1000_RCTL_EN); | 2918 | if (!(adapter->flags2 & FLAG2_NO_DISABLE_RX)) |
2919 | ew32(RCTL, rctl & ~E1000_RCTL_EN); | ||
2919 | e1e_flush(); | 2920 | e1e_flush(); |
2920 | usleep_range(10000, 20000); | 2921 | usleep_range(10000, 20000); |
2921 | 2922 | ||
@@ -3394,7 +3395,8 @@ void e1000e_down(struct e1000_adapter *adapter) | |||
3394 | 3395 | ||
3395 | /* disable receives in the hardware */ | 3396 | /* disable receives in the hardware */ |
3396 | rctl = er32(RCTL); | 3397 | rctl = er32(RCTL); |
3397 | ew32(RCTL, rctl & ~E1000_RCTL_EN); | 3398 | if (!(adapter->flags2 & FLAG2_NO_DISABLE_RX)) |
3399 | ew32(RCTL, rctl & ~E1000_RCTL_EN); | ||
3398 | /* flush and sleep below */ | 3400 | /* flush and sleep below */ |
3399 | 3401 | ||
3400 | netif_stop_queue(netdev); | 3402 | netif_stop_queue(netdev); |
@@ -3403,6 +3405,7 @@ void e1000e_down(struct e1000_adapter *adapter) | |||
3403 | tctl = er32(TCTL); | 3405 | tctl = er32(TCTL); |
3404 | tctl &= ~E1000_TCTL_EN; | 3406 | tctl &= ~E1000_TCTL_EN; |
3405 | ew32(TCTL, tctl); | 3407 | ew32(TCTL, tctl); |
3408 | |||
3406 | /* flush both disables and wait for them to finish */ | 3409 | /* flush both disables and wait for them to finish */ |
3407 | e1e_flush(); | 3410 | e1e_flush(); |
3408 | usleep_range(10000, 20000); | 3411 | usleep_range(10000, 20000); |