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

Commit 0b3ba055 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

tg3: Use tp->rxq_cnt when checking RSS tables. 



irq_cnt is no longer reliable since rxq_cnt can be independently configured.

Update version to 3.127.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 93df8b8f

drivers/net/ethernet/broadcom/tg3.c

+4 −4
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			126

#define TG3_MIN_NUM			127

#define DRV_MODULE_VERSION	\

	__stringify(TG3_MAJ_NUM) "." __stringify(TG3_MIN_NUM)

#define DRV_MODULE_RELDATE	"November 05, 2012"

#define DRV_MODULE_RELDATE	"November 14, 2012"



#define RESET_KIND_SHUTDOWN	0

#define RESET_KIND_INIT		1
@@ -8710,14 +8710,14 @@ static void tg3_rss_check_indir_tbl(struct tg3 *tp) 
	if (!tg3_flag(tp, SUPPORT_MSIX))

		return;



	if (tp->irq_cnt <= 2) {

	if (tp->rxq_cnt == 1) {

		memset(&tp->rss_ind_tbl[0], 0, sizeof(tp->rss_ind_tbl));

		return;

	}



	/* Validate table against current IRQ count */

	for (i = 0; i < TG3_RSS_INDIR_TBL_SIZE; i++) {

		if (tp->rss_ind_tbl[i] >= tp->irq_cnt - 1)

		if (tp->rss_ind_tbl[i] >= tp->rxq_cnt)

			break;

	}