]> err.no Git - linux-2.6/commitdiff
fs_enet: restore promiscuous and multicast settings in restart()
authorLaurent Pinchart <laurentp@cse-semaphore.com>
Thu, 26 Jun 2008 09:48:22 +0000 (11:48 +0200)
committerJeff Garzik <jgarzik@redhat.com>
Fri, 4 Jul 2008 12:21:53 +0000 (08:21 -0400)
The restart() function is called when the link state changes and resets
multicast and promiscuous settings. This patch restores those settings at the
end of restart().

Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/fs_enet/mac-fcc.c

index e36321152d504cf0f9a23b880f07e6afbba5b565..8268b3535b30caff91ed208ec6c85025a658238e 100644 (file)
@@ -463,6 +463,9 @@ static void restart(struct net_device *dev)
        else
                C32(fccp, fcc_fpsmr, FCC_PSMR_FDE | FCC_PSMR_LPB);
 
+       /* Restore multicast and promiscuous settings */
+       set_multicast_list(dev);
+
        S32(fccp, fcc_gfmr, FCC_GFMR_ENR | FCC_GFMR_ENT);
 }