summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
diff options
context:
space:
mode:
authorMichal Schmidt2015-04-28 11:34:22 +0200
committerDavid S. Miller2015-04-29 20:48:35 +0200
commit7e6b4d440b0ae9062b84dfb417ea6d51a45dab76 (patch)
treeccfc1cbabb682704fc3175fc3231642f18d63e74 /drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
parentbnx2x: mark LRO as a fixed disabled feature if disable_tpa is set (diff)
downloadkernel-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.h')
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 355d5fea5be9..2a41604cdd0e 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -521,6 +521,7 @@ struct bnx2x_fp_txdata {
};
enum bnx2x_tpa_mode_t {
+ TPA_MODE_DISABLED,
TPA_MODE_LRO,
TPA_MODE_GRO
};
@@ -589,7 +590,6 @@ struct bnx2x_fastpath {
/* TPA related */
struct bnx2x_agg_info *tpa_info;
- u8 disable_tpa;
#ifdef BNX2X_STOP_ON_ERROR
u64 tpa_queue_used;
#endif