aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike McCormack <mikem@ring3k.org>2010-05-13 06:12:48 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-02 10:29:27 -0700
commit7fcce089f520a389e3f43ac0f939eb17462d7284 (patch)
tree587e42160347b24a39f5c300b02b8669d62e7212
parentba7afdd80a6a91fd7fac2aa17cadb75d4b427c13 (diff)
sky2: Restore multicast after restart
commit 37652522faa0877dc6d0dbb6b999bdccc07f0e89 upstream. Multicast settings will be lost on reset, so restore them. Signed-off-by: Mike McCormack <mikem@ring3k.org> Acked-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/net/sky2.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 088c797eb73..c5d83f55bac 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -3293,6 +3293,7 @@ static void sky2_restart(struct work_struct *work)
continue;
sky2_hw_up(sky2);
+ sky2_set_multicast(dev);
netif_wake_queue(dev);
}