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

Commit bd473da3 authored by Nithin Nayak Sujir's avatar Nithin Nayak Sujir Committed by David S. Miller
Browse files

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: default avatarNithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 79d49695

drivers/net/ethernet/broadcom/tg3.c

+3 −5
Original line number Diff line number Diff line
@@ -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);