summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
diff options
context:
space:
mode:
authorYuval Mintz2014-01-12 13:37:59 +0100
committerDavid S. Miller2014-01-15 02:10:30 +0100
commitc14db20259ccb623171d4b788e51dd3e8df901d7 (patch)
treedd0da2ef8ef0bb8a96dd47d27cf218995734b08c /drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
parentMerge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next (diff)
downloadkernel-qcow2-linux-c14db20259ccb623171d4b788e51dd3e8df901d7.tar.gz
kernel-qcow2-linux-c14db20259ccb623171d4b788e51dd3e8df901d7.tar.xz
kernel-qcow2-linux-c14db20259ccb623171d4b788e51dd3e8df901d7.zip
bnx2x: Correct default Tx switching behaviour
With this patch bnx2x will configure the PF to perform Tx switching on out-going traffic as soon as SR-IOV is dynamically enabled and de-activate it when it is disabled. This will allow VFs to communicate with their parent PFs. Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com> Signed-off-by: Ariel Elior <ariele@broadcom.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.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index f90079acb58c..cf17b660b4ee 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -3007,6 +3007,9 @@ static unsigned long bnx2x_get_common_flags(struct bnx2x *bp,
if (zero_stats)
__set_bit(BNX2X_Q_FLG_ZERO_STATS, &flags);
+ if (bp->flags & TX_SWITCHING)
+ __set_bit(BNX2X_Q_FLG_TX_SWITCH, &flags);
+
__set_bit(BNX2X_Q_FLG_PCSUM_ON_PKT, &flags);
__set_bit(BNX2X_Q_FLG_TUN_INC_INNER_IP_ID, &flags);