diff options
| author |   Christoph Müllner <christoph.muellner@theobroma-systems.com> | 2013-06-27 21:18:23 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-07-01 13:29:26 -0700 |
| commit | 772e42b07fbdc650206746e00cb2914e362594a3 (patch) | |
| tree | 1060cd815ee6462cb27a8b8edba1c226fb4bbcf4 /drivers/net/ethernet/freescale/fec_main.c | |
| parent | ipv6: fix ecmp lookup when oif is specified (diff) | |
| download | linux-dev-772e42b07fbdc650206746e00cb2914e362594a3.tar.xz linux-dev-772e42b07fbdc650206746e00cb2914e362594a3.zip | |
net: fec: Fix multicast list setup in fec_restart().
Setup the multicast list of the net_device instead of
clearing it blindly. This restores the multicast groups
in case of a link down/up event or when resuming from
suspend.
Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale/fec_main.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index ed6180e7db2f..5664acd8e0f4 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -59,6 +59,8 @@ #include "fec.h" +static void set_multicast_list(struct net_device *ndev); + #if defined(CONFIG_ARM) #define FEC_ALIGNMENT 0xf #else @@ -470,9 +472,8 @@ fec_restart(struct net_device *ndev, int duplex) /* Clear any outstanding interrupt. */ writel(0xffc00000, fep->hwp + FEC_IEVENT); - /* Reset all multicast. */ - writel(0, fep->hwp + FEC_GRP_HASH_TABLE_HIGH); - writel(0, fep->hwp + FEC_GRP_HASH_TABLE_LOW); + /* Setup multicast filter. */ + set_multicast_list(ndev); #ifndef CONFIG_M5272 writel(0, fep->hwp + FEC_HASH_TABLE_HIGH); writel(0, fep->hwp + FEC_HASH_TABLE_LOW); |