diff options
| author | Vladislav Zolotarov <vladz@broadcom.com> | 2011-07-19 01:44:11 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-19 09:57:49 -0700 |
| commit | f5219d8eb8b32eb32522063d2163f95e1cf7bb5c (patch) | |
| tree | d5ff7663f6769de1975362ba89e42cf2648b7cb1 /drivers/net | |
| parent | 019dbb4c0106f11b5c6543bffaedf10067e28398 (diff) | |
| download | linux-3.10-f5219d8eb8b32eb32522063d2163f95e1cf7bb5c.tar.gz linux-3.10-f5219d8eb8b32eb32522063d2163f95e1cf7bb5c.tar.bz2 linux-3.10-f5219d8eb8b32eb32522063d2163f95e1cf7bb5c.zip | |
bnx2x: use BNX2X_Q_FLG_TPA_IPV6 for TPA queue configuration
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_main.c | 4 | ||||
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_sp.c | 2 | ||||
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_sp.h | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c index b8f8793912c..7a891824fab 100644 --- a/drivers/net/bnx2x/bnx2x_main.c +++ b/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/drivers/net/bnx2x/bnx2x_sp.c b/drivers/net/bnx2x/bnx2x_sp.c index 6306ff59de0..5a213e476d8 100644 --- a/drivers/net/bnx2x/bnx2x_sp.c +++ b/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/drivers/net/bnx2x/bnx2x_sp.h b/drivers/net/bnx2x/bnx2x_sp.h index 73400dd77b2..9a517c2e9f1 100644 --- a/drivers/net/bnx2x/bnx2x_sp.h +++ b/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, |