[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <51126F82.2030605@openwrt.org>
Date: Wed, 06 Feb 2013 15:58:10 +0100
From: Florian Fainelli <florian@...nwrt.org>
To: Hauke Mehrtens <hauke@...ke-m.de>
CC: davem@...emloft.net, zajec5@...il.com, netdev@...r.kernel.org
Subject: Re: [PATCH 4/4] bgmac: add ndo_set_rx_mode netdev ops
Hello Hauke,
On 02/06/2013 03:45 PM, Hauke Mehrtens wrote:
> Currently it is only possible to activate or deactivate promisc mode
> while the device is up.
This is required for bridging to work, so it is definitively a good fix
to have.
>
> Signed-off-by: Hauke Mehrtens <hauke@...ke-m.de>
> ---
> drivers/net/ethernet/broadcom/bgmac.c | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
> index e0775c4..23c8d4a 100644
> --- a/drivers/net/ethernet/broadcom/bgmac.c
> +++ b/drivers/net/ethernet/broadcom/bgmac.c
> @@ -771,6 +771,16 @@ static void bgmac_write_mac_address(struct bgmac *bgmac, u8 *addr)
> bgmac_write(bgmac, BGMAC_MACADDR_LOW, tmp);
> }
>
> +static void bgmac_set_rx_mode(struct net_device *net_dev)
> +{
> + struct bgmac *bgmac = netdev_priv(net_dev);
> +
> + if (net_dev->flags & IFF_PROMISC)
> + bgmac_cmdcfg_maskset(bgmac, ~0, BGMAC_CMDCFG_PROM, false);
> + else
> + bgmac_cmdcfg_maskset(bgmac, ~BGMAC_CMDCFG_PROM, 0, false);
> +}
> +
> #if 0 /* We don't use that regs yet */
> static void bgmac_chip_stats_update(struct bgmac *bgmac)
> {
> @@ -1024,10 +1034,7 @@ static void bgmac_chip_init(struct bgmac *bgmac, bool full_init)
> /* Enable 802.3x tx flow control (honor received PAUSE frames) */
> bgmac_cmdcfg_maskset(bgmac, ~BGMAC_CMDCFG_RPI, 0, true);
>
> - if (bgmac->net_dev->flags & IFF_PROMISC)
> - bgmac_cmdcfg_maskset(bgmac, ~0, BGMAC_CMDCFG_PROM, false);
> - else
> - bgmac_cmdcfg_maskset(bgmac, ~BGMAC_CMDCFG_PROM, 0, false);
> + bgmac_set_rx_mode(bgmac->net_dev);
>
> bgmac_write_mac_address(bgmac, bgmac->net_dev->dev_addr);
>
> @@ -1209,6 +1216,7 @@ static const struct net_device_ops bgmac_netdev_ops = {
> .ndo_open = bgmac_open,
> .ndo_stop = bgmac_stop,
> .ndo_start_xmit = bgmac_start_xmit,
> + .ndo_set_rx_mode = bgmac_set_rx_mode,
> .ndo_set_mac_address = bgmac_set_mac_address,
> .ndo_validate_addr = eth_validate_addr,
> .ndo_do_ioctl = bgmac_ioctl,
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists