diff options
| author | Nithin Nayak Sujir <nsujir@broadcom.com> | 2012-11-05 15:26:30 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-07 01:00:14 +0100 |
| commit | bd473da35bc21a0004b8ad35c19e0c8b53b03f36 (patch) | |
| tree | af7ec6cbbba86793f0977391b130542a15b4ea00 /drivers | |
| parent | tg3: Support 5717 C0 (diff) | |
| download | linux-bd473da35bc21a0004b8ad35c19e0c8b53b03f36.tar.xz linux-bd473da35bc21a0004b8ad35c19e0c8b53b03f36.zip | |
tg3: Call tg3_netif_stop() from tg3_stop()
instead of making separate tg3_napi_disable() and netif_tx_disable() calls.
Update version to 3.126.
Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index b7817cab46e9..038ce0215e3e 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -90,10 +90,10 @@ static inline void _tg3_flag_clear(enum TG3_FLAGS flag, unsigned long *bits) #define DRV_MODULE_NAME "tg3" #define TG3_MAJ_NUM 3 -#define TG3_MIN_NUM 125 +#define TG3_MIN_NUM 126 #define DRV_MODULE_VERSION \ __stringify(TG3_MAJ_NUM) "." __stringify(TG3_MIN_NUM) -#define DRV_MODULE_RELDATE "September 26, 2012" +#define DRV_MODULE_RELDATE "November 05, 2012" #define RESET_KIND_SHUTDOWN 0 #define RESET_KIND_INIT 1 @@ -10430,10 +10430,8 @@ static void tg3_stop(struct tg3 *tp) { int i; - tg3_napi_disable(tp); tg3_reset_task_cancel(tp); - - netif_tx_disable(tp->dev); + tg3_netif_stop(tp); tg3_timer_stop(tp); |