diff options
| author |   Ron Mercer <ron.mercer@qlogic.com> | 2010-10-27 04:58:12 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-10-27 11:37:30 -0700 |
| commit | c1b60092cf307fef12f793abf7cf8167e26a6ccf (patch) | |
| tree | c2dc4b94b2f2ba1423c1d7252677b9ce9c141518 /drivers/net | |
| parent | be2net: Schedule/Destroy worker thread in probe()/remove() rather than open()/close() (diff) | |
| download | linux-dev-c1b60092cf307fef12f793abf7cf8167e26a6ccf.tar.xz linux-dev-c1b60092cf307fef12f793abf7cf8167e26a6ccf.zip | |
qlge: bugfix: Restoring the vlan setting.
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/qlge/qlge_main.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index e6210563abd4..c30e0fe55a31 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c @@ -2385,6 +2385,20 @@ static void qlge_vlan_rx_kill_vid(struct net_device *ndev, u16 vid) } +static void qlge_restore_vlan(struct ql_adapter *qdev) +{ + qlge_vlan_rx_register(qdev->ndev, qdev->vlgrp); + + if (qdev->vlgrp) { + u16 vid; + for (vid = 0; vid < VLAN_N_VID; vid++) { + if (!vlan_group_get_device(qdev->vlgrp, vid)) + continue; + qlge_vlan_rx_add_vid(qdev->ndev, vid); + } + } +} + /* MSI-X Multiple Vector Interrupt Handler for inbound completions. */ static irqreturn_t qlge_msix_rx_isr(int irq, void *dev_id) { @@ -3960,6 +3974,9 @@ static int ql_adapter_up(struct ql_adapter *qdev) clear_bit(QL_PROMISCUOUS, &qdev->flags); qlge_set_multicast_list(qdev->ndev); + /* Restore vlan setting. */ + qlge_restore_vlan(qdev); + ql_enable_interrupts(qdev); ql_enable_all_completion_interrupts(qdev); netif_tx_start_all_queues(qdev->ndev); |