Message ID | 1316221608-21392-2-git-send-email-rmody@brocade.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Rasesh Mody <rmody@brocade.com> Date: Fri, 16 Sep 2011 18:06:47 -0700 > When Rx queue size is changed, queues are torn down and setup with the new queue > size. During this operation, clear promiscuous mode and restore the original > VLAN filter. > > Signed-off-by: Gurunatha Karaje <gkaraje@brocade.com> > Signed-off-by: Rasesh Mody <rmody@brocade.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c index 4842224..ac6b495 100644 --- a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c +++ b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c @@ -471,16 +471,17 @@ bnad_set_ringparam(struct net_device *netdev, current_err = bnad_setup_rx(bnad, i); if (current_err && !err) err = current_err; - if (!err) - bnad_restore_vlans(bnad, i); } if (!err && bnad->rx_info[0].rx) { /* restore rx configuration */ + bnad_restore_vlans(bnad, 0); bnad_enable_default_bcast(bnad); spin_lock_irqsave(&bnad->bna_lock, flags); bnad_mac_addr_set_locked(bnad, netdev->dev_addr); spin_unlock_irqrestore(&bnad->bna_lock, flags); + bnad->cfg_flags &= ~(BNAD_CF_ALLMULTI | + BNAD_CF_PROMISC); bnad_set_rx_mode(netdev); } }