bna: Enable pure priority tagged packet reception and rxf uninit cleanup fix

Change Details:
	- Enable reception of pure priority tagged packets by default by
	turning on VLAN Id = 0
	- Clear the promiscuous mode, all multicast mode flags when
	bna_rxf_uninit is called

Signed-off-by: Debashis Dutt <ddutt@brocade.com>
Signed-off-by: Rasesh Mody <rmody@brocade.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bna/bna_txrx.c b/drivers/net/bna/bna_txrx.c
index fb6cf1f19c99b42867967bd9f9ec9aa7031575dc..50766181d585051d487f646b68bb4d50f798ac77 100644 (file)
--- a/drivers/net/bna/bna_txrx.c
+++ b/drivers/net/bna/bna_txrx.c
@@ -1441,12 +1441,16 @@ bna_rxf_init(struct bna_rxf *rxf,
        memset(rxf->vlan_filter_table, 0,
                        (sizeof(u32) * ((BFI_MAX_VLAN + 1) / 32)));
 
+       /* Set up VLAN 0 for pure priority tagged packets */
+       rxf->vlan_filter_table[0] |= 1;
+
        bfa_fsm_set_state(rxf, bna_rxf_sm_stopped);
 }
 
 static void
 bna_rxf_uninit(struct bna_rxf *rxf)
 {
+       struct bna *bna = rxf->rx->bna;
        struct bna_mac *mac;
 
        bna_rit_mod_seg_put(&rxf->rx->bna->rit_mod, rxf->rit_segment);
@@ -1473,6 +1477,27 @@ bna_rxf_uninit(struct bna_rxf *rxf)
                bna_mcam_mod_mac_put(&rxf->rx->bna->mcam_mod, mac);
        }
 
+       /* Turn off pending promisc mode */
+       if (is_promisc_enable(rxf->rxmode_pending,
+                               rxf->rxmode_pending_bitmask)) {
+               /* system promisc state should be pending */
+               BUG_ON(!(bna->rxf_promisc_id == rxf->rxf_id));
+               promisc_inactive(rxf->rxmode_pending,
+                               rxf->rxmode_pending_bitmask);
+                bna->rxf_promisc_id = BFI_MAX_RXF;
+       }
+       /* Promisc mode should not be active */
+       BUG_ON(rxf->rxmode_active & BNA_RXMODE_PROMISC);
+
+       /* Turn off pending all-multi mode */
+       if (is_allmulti_enable(rxf->rxmode_pending,
+                               rxf->rxmode_pending_bitmask)) {
+               allmulti_inactive(rxf->rxmode_pending,
+                               rxf->rxmode_pending_bitmask);
+       }
+       /* Allmulti mode should not be active */
+       BUG_ON(rxf->rxmode_active & BNA_RXMODE_ALLMULTI);
+
        rxf->rx = NULL;
 }