diff options
author | David S. Miller | 2014-10-08 22:22:22 +0200 |
---|---|---|
committer | David S. Miller | 2014-10-08 22:22:22 +0200 |
commit | 64b1f00a0830e1c53874067273a096b228d83d36 (patch) | |
tree | dd547b0f1d431d0995b8eaa711cedb92399f31fe /drivers/net/ethernet/brocade/bna/bna_tx_rx.c | |
parent | netlabel: directly return netlbl_unlabel_genl_init() (diff) | |
parent | net_sched: copy exts->type in tcf_exts_change() (diff) | |
download | kernel-qcow2-linux-64b1f00a0830e1c53874067273a096b228d83d36.tar.gz kernel-qcow2-linux-64b1f00a0830e1c53874067273a096b228d83d36.tar.xz kernel-qcow2-linux-64b1f00a0830e1c53874067273a096b228d83d36.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/brocade/bna/bna_tx_rx.c')
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/brocade/bna/bna_tx_rx.c b/drivers/net/ethernet/brocade/bna/bna_tx_rx.c index 8ee3fdcc17cd..5fac411c52f4 100644 --- a/drivers/net/ethernet/brocade/bna/bna_tx_rx.c +++ b/drivers/net/ethernet/brocade/bna/bna_tx_rx.c @@ -3410,7 +3410,7 @@ bna_bfi_tx_enet_start(struct bna_tx *tx) cfg_req->tx_cfg.vlan_mode = BFI_ENET_TX_VLAN_WI; cfg_req->tx_cfg.vlan_id = htons((u16)tx->txf_vlan_id); - cfg_req->tx_cfg.admit_tagged_frame = BNA_STATUS_T_DISABLED; + cfg_req->tx_cfg.admit_tagged_frame = BNA_STATUS_T_ENABLED; cfg_req->tx_cfg.apply_vlan_filter = BNA_STATUS_T_DISABLED; bfa_msgq_cmd_set(&tx->msgq_cmd, NULL, NULL, |