diff options
| author | Michal Schmidt | 2015-04-28 11:34:22 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-04-29 20:48:35 +0200 |
| commit | 7e6b4d440b0ae9062b84dfb417ea6d51a45dab76 (patch) | |
| tree | ccfc1cbabb682704fc3175fc3231642f18d63e74 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |
| parent | bnx2x: mark LRO as a fixed disabled feature if disable_tpa is set (diff) | |
| download | kernel-qcow2-linux-7e6b4d440b0ae9062b84dfb417ea6d51a45dab76.tar.gz kernel-qcow2-linux-7e6b4d440b0ae9062b84dfb417ea6d51a45dab76.tar.xz kernel-qcow2-linux-7e6b4d440b0ae9062b84dfb417ea6d51a45dab76.zip | |
bnx2x: merge fp->disable_tpa with fp->mode
It is simpler to have the TPA mode as one three-state variable.
Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 2d067c937bd1..64ea5adf72eb 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -3128,7 +3128,7 @@ static unsigned long bnx2x_get_q_flags(struct bnx2x *bp, __set_bit(BNX2X_Q_FLG_FORCE_DEFAULT_PRI, &flags); } - if (!fp->disable_tpa) { + if (fp->mode != TPA_MODE_DISABLED) { __set_bit(BNX2X_Q_FLG_TPA, &flags); __set_bit(BNX2X_Q_FLG_TPA_IPV6, &flags); if (fp->mode == TPA_MODE_GRO) @@ -3176,7 +3176,7 @@ static void bnx2x_pf_rx_q_prep(struct bnx2x *bp, u16 sge_sz = 0; u16 tpa_agg_size = 0; - if (!fp->disable_tpa) { + if (fp->mode != TPA_MODE_DISABLED) { pause->sge_th_lo = SGE_TH_LO(bp); pause->sge_th_hi = SGE_TH_HI(bp); |