Commit f5ae6279 authored by Claudiu Manoil's avatar Claudiu Manoil Committed by David S. Miller

gianfar: Restore promisc mode on gfar_init_mac()

Reactivate promiscuous mode in H/W upon gfar_init_mac(), if the
net dev requires it (IFF_PROMISC flag set).
This way the promisc mode is preserved accross device reset conditions
like tx timeout, device restore, a.s.o.
Signed-off-by: default avatarVoncken C Acksys <cedric.voncken@acksys.fr>
Signed-off-by: default avatarClaudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c617f398
...@@ -355,6 +355,10 @@ static void gfar_init_mac(struct net_device *ndev) ...@@ -355,6 +355,10 @@ static void gfar_init_mac(struct net_device *ndev)
gfar_write(&regs->rir0, DEFAULT_RIR0); gfar_write(&regs->rir0, DEFAULT_RIR0);
} }
/* Restore PROMISC mode */
if (ndev->flags & IFF_PROMISC)
rctrl |= RCTRL_PROM;
if (ndev->features & NETIF_F_RXCSUM) if (ndev->features & NETIF_F_RXCSUM)
rctrl |= RCTRL_CHECKSUMMING; rctrl |= RCTRL_CHECKSUMMING;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment