Commit c6edfe10 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by David S. Miller

bgmac: add ndo_set_rx_mode netdev ops

When changing the device from or to promisc mode this only affects the
device after the device is bought up the next time. For bridging it is
needed to change the device to promisc mode while it is up, which is
possible with this patch.
Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 522c5907
...@@ -771,6 +771,16 @@ static void bgmac_write_mac_address(struct bgmac *bgmac, u8 *addr) ...@@ -771,6 +771,16 @@ static void bgmac_write_mac_address(struct bgmac *bgmac, u8 *addr)
bgmac_write(bgmac, BGMAC_MACADDR_LOW, tmp); 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 */ #if 0 /* We don't use that regs yet */
static void bgmac_chip_stats_update(struct bgmac *bgmac) static void bgmac_chip_stats_update(struct bgmac *bgmac)
{ {
...@@ -1024,10 +1034,7 @@ static void bgmac_chip_init(struct bgmac *bgmac, bool full_init) ...@@ -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) */ /* Enable 802.3x tx flow control (honor received PAUSE frames) */
bgmac_cmdcfg_maskset(bgmac, ~BGMAC_CMDCFG_RPI, 0, true); bgmac_cmdcfg_maskset(bgmac, ~BGMAC_CMDCFG_RPI, 0, true);
if (bgmac->net_dev->flags & IFF_PROMISC) bgmac_set_rx_mode(bgmac->net_dev);
bgmac_cmdcfg_maskset(bgmac, ~0, BGMAC_CMDCFG_PROM, false);
else
bgmac_cmdcfg_maskset(bgmac, ~BGMAC_CMDCFG_PROM, 0, false);
bgmac_write_mac_address(bgmac, bgmac->net_dev->dev_addr); bgmac_write_mac_address(bgmac, bgmac->net_dev->dev_addr);
...@@ -1209,6 +1216,7 @@ static const struct net_device_ops bgmac_netdev_ops = { ...@@ -1209,6 +1216,7 @@ static const struct net_device_ops bgmac_netdev_ops = {
.ndo_open = bgmac_open, .ndo_open = bgmac_open,
.ndo_stop = bgmac_stop, .ndo_stop = bgmac_stop,
.ndo_start_xmit = bgmac_start_xmit, .ndo_start_xmit = bgmac_start_xmit,
.ndo_set_rx_mode = bgmac_set_rx_mode,
.ndo_set_mac_address = bgmac_set_mac_address, .ndo_set_mac_address = bgmac_set_mac_address,
.ndo_validate_addr = eth_validate_addr, .ndo_validate_addr = eth_validate_addr,
.ndo_do_ioctl = bgmac_ioctl, .ndo_do_ioctl = bgmac_ioctl,
......
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