From 334dc8614e17f179da1d3c880dcd7059f52c06c3 Mon Sep 17 00:00:00 2001 From: Vladislav Zolotarov Date: Tue, 19 Jul 2011 01:44:11 +0000 Subject: [PATCH] --- yaml --- r: 256508 b: refs/heads/master c: f5219d8eb8b32eb32522063d2163f95e1cf7bb5c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2x/bnx2x_main.c | 4 +++- trunk/drivers/net/bnx2x/bnx2x_sp.c | 2 +- trunk/drivers/net/bnx2x/bnx2x_sp.h | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5a947f9b15e1..96f47f320f16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 019dbb4c0106f11b5c6543bffaedf10067e28398 +refs/heads/master: f5219d8eb8b32eb32522063d2163f95e1cf7bb5c diff --git a/trunk/drivers/net/bnx2x/bnx2x_main.c b/trunk/drivers/net/bnx2x/bnx2x_main.c index b8f8793912c8..7a891824fab2 100644 --- a/trunk/drivers/net/bnx2x/bnx2x_main.c +++ b/trunk/drivers/net/bnx2x/bnx2x_main.c @@ -2699,8 +2699,10 @@ static inline unsigned long bnx2x_get_q_flags(struct bnx2x *bp, if (IS_FCOE_FP(fp)) __set_bit(BNX2X_Q_FLG_FCOE, &flags); - if (!fp->disable_tpa) + if (!fp->disable_tpa) { __set_bit(BNX2X_Q_FLG_TPA, &flags); + __set_bit(BNX2X_Q_FLG_TPA_IPV6, &flags); + } if (leading) { __set_bit(BNX2X_Q_FLG_LEADING_RSS, &flags); diff --git a/trunk/drivers/net/bnx2x/bnx2x_sp.c b/trunk/drivers/net/bnx2x/bnx2x_sp.c index 6306ff59de0c..5a213e476d85 100644 --- a/trunk/drivers/net/bnx2x/bnx2x_sp.c +++ b/trunk/drivers/net/bnx2x/bnx2x_sp.c @@ -4240,7 +4240,7 @@ static void bnx2x_q_fill_setup_data_e2(struct bnx2x *bp, /* Rx data */ /* IPv6 TPA supported for E2 and above only */ - data->rx.tpa_en |= test_bit(BNX2X_Q_FLG_TPA, ¶ms->flags) * + data->rx.tpa_en |= test_bit(BNX2X_Q_FLG_TPA_IPV6, ¶ms->flags) * CLIENT_INIT_RX_DATA_TPA_EN_IPV6; } diff --git a/trunk/drivers/net/bnx2x/bnx2x_sp.h b/trunk/drivers/net/bnx2x/bnx2x_sp.h index 73400dd77b2f..9a517c2e9f1b 100644 --- a/trunk/drivers/net/bnx2x/bnx2x_sp.h +++ b/trunk/drivers/net/bnx2x/bnx2x_sp.h @@ -749,6 +749,7 @@ enum bnx2x_queue_cmd { /* queue SETUP + INIT flags */ enum { BNX2X_Q_FLG_TPA, + BNX2X_Q_FLG_TPA_IPV6, BNX2X_Q_FLG_STATS, BNX2X_Q_FLG_ZERO_STATS, BNX2X_Q_FLG_ACTIVE,