iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: introduce IFF_UNICAST_FLT private flag

Browse Source 
Use IFF_UNICAST_FTL to find out if driver handles unicast address
filtering. In case it does not, promisc mode is entered.

Patch also fixes following drivers:
stmmac, niu: support uc filtering and yet it propagated
	ndo_set_multicast_list
bna, benet, pxa168_eth, ks8851, ks8851_mll, ksz884x : has set
	ndo_set_rx_mode but do not support uc filtering

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2011-08-16 06:29:00 +00:00 committed by David S. Miller
parent d03462b999
commit 01789349ee
17 changed files with 51 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/broadcom/bnx2.c
View File

@ -36,6 +36,7 @@
#include <linux/time.h> #include <linux/time.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/mii.h> #include <linux/mii.h>
#include <linux/if.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <net/ip.h> #include <net/ip.h>
#include <net/tcp.h> #include <net/tcp.h>
@ -8370,6 +8371,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
dev->vlan_features = dev->hw_features; dev->vlan_features = dev->hw_features;
dev->hw_features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; dev->hw_features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
dev->features |= dev->hw_features; dev->features |= dev->hw_features;
dev->priv_flags |= IFF_UNICAST_FLT;
if ((rc = register_netdev(dev))) { if ((rc = register_netdev(dev))) {
dev_err(&pdev->dev, "Cannot register net device\n"); dev_err(&pdev->dev, "Cannot register net device\n");

3
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
View File

@ -39,6 +39,7 @@
#include <linux/time.h> #include <linux/time.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/mii.h> #include <linux/mii.h>
#include <linux/if.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <net/ip.h> #include <net/ip.h>
#include <net/ipv6.h> #include <net/ipv6.h>
@ -10266,6 +10267,8 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev,
dev->netdev_ops = &bnx2x_netdev_ops; dev->netdev_ops = &bnx2x_netdev_ops;
bnx2x_set_ethtool_ops(dev); bnx2x_set_ethtool_ops(dev);
dev->priv_flags |= IFF_UNICAST_FLT;
dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6 |
NETIF_F_RXCSUM | NETIF_F_LRO | NETIF_F_HW_VLAN_TX; NETIF_F_RXCSUM | NETIF_F_LRO | NETIF_F_HW_VLAN_TX;

3
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
View File

@ -41,6 +41,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/firmware.h> #include <linux/firmware.h>
#include <linux/if.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/log2.h> #include <linux/log2.h>
@ -3639,6 +3640,8 @@ static int __devinit init_one(struct pci_dev *pdev,
netdev->features |= netdev->hw_features | highdma; netdev->features |= netdev->hw_features | highdma;
netdev->vlan_features = netdev->features & VLAN_FEAT; netdev->vlan_features = netdev->features & VLAN_FEAT;
netdev->priv_flags |= IFF_UNICAST_FLT;
netdev->netdev_ops = &cxgb4_netdev_ops; netdev->netdev_ops = &cxgb4_netdev_ops;
SET_ETHTOOL_OPS(netdev, &cxgb_ethtool_ops); SET_ETHTOOL_OPS(netdev, &cxgb_ethtool_ops);
} }

2
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
View File

@ -2625,6 +2625,8 @@ static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev,
if (pci_using_dac) if (pci_using_dac)
netdev->features |= NETIF_F_HIGHDMA; netdev->features |= NETIF_F_HIGHDMA;
netdev->priv_flags |= IFF_UNICAST_FLT;
netdev->netdev_ops = &cxgb4vf_netdev_ops; netdev->netdev_ops = &cxgb4vf_netdev_ops;
SET_ETHTOOL_OPS(netdev, &cxgb4vf_ethtool_ops); SET_ETHTOOL_OPS(netdev, &cxgb4vf_ethtool_ops);

3
drivers/net/ethernet/cisco/enic/enic_main.c
View File

@ -28,6 +28,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/if.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
@ -2442,6 +2443,8 @@ static int __devinit enic_probe(struct pci_dev *pdev,
if (using_dac) if (using_dac)
netdev->features |= NETIF_F_HIGHDMA; netdev->features |= NETIF_F_HIGHDMA;
netdev->priv_flags |= IFF_UNICAST_FLT;
err = register_netdev(netdev); err = register_netdev(netdev);
if (err) { if (err) {
dev_err(dev, "Cannot register net device, aborting\n"); dev_err(dev, "Cannot register net device, aborting\n");

2
drivers/net/ethernet/intel/e1000/e1000_main.c
View File

@ -1080,6 +1080,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
netdev->vlan_features |= NETIF_F_HW_CSUM; netdev->vlan_features |= NETIF_F_HW_CSUM;
netdev->vlan_features |= NETIF_F_SG; netdev->vlan_features |= NETIF_F_SG;
netdev->priv_flags |= IFF_UNICAST_FLT;
adapter->en_mng_pt = e1000_enable_mng_pass_thru(hw); adapter->en_mng_pt = e1000_enable_mng_pass_thru(hw);
/* initialize eeprom parameters */ /* initialize eeprom parameters */

3
drivers/net/ethernet/intel/igb/igb_main.c
View File

@ -39,6 +39,7 @@
#include <linux/net_tstamp.h> #include <linux/net_tstamp.h>
#include <linux/mii.h> #include <linux/mii.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/if.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/pci-aspm.h> #include <linux/pci-aspm.h>
@ -1973,6 +1974,8 @@ static int __devinit igb_probe(struct pci_dev *pdev,
netdev->features |= NETIF_F_SCTP_CSUM; netdev->features |= NETIF_F_SCTP_CSUM;
} }
netdev->priv_flags |= IFF_UNICAST_FLT;
adapter->en_mng_pt = igb_enable_mng_pass_thru(hw); adapter->en_mng_pt = igb_enable_mng_pass_thru(hw);
/* before reading the NVM, reset the controller to put the device in a /* before reading the NVM, reset the controller to put the device in a

3
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
View File

@ -42,6 +42,7 @@
#include <net/checksum.h> #include <net/checksum.h>
#include <net/ip6_checksum.h> #include <net/ip6_checksum.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/if.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/prefetch.h> #include <linux/prefetch.h>
#include <scsi/fc/fc_fcoe.h> #include <scsi/fc/fc_fcoe.h>
@ -7527,6 +7528,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
netdev->vlan_features |= NETIF_F_IPV6_CSUM; netdev->vlan_features |= NETIF_F_IPV6_CSUM;
netdev->vlan_features |= NETIF_F_SG; netdev->vlan_features |= NETIF_F_SG;
netdev->priv_flags |= IFF_UNICAST_FLT;
if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
adapter->flags &= ~(IXGBE_FLAG_RSS_ENABLED | adapter->flags &= ~(IXGBE_FLAG_RSS_ENABLED |
IXGBE_FLAG_DCB_ENABLED); IXGBE_FLAG_DCB_ENABLED);

3
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
View File

@ -44,6 +44,7 @@
#include <net/checksum.h> #include <net/checksum.h>
#include <net/ip6_checksum.h> #include <net/ip6_checksum.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/if.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/prefetch.h> #include <linux/prefetch.h>
@ -3358,6 +3359,8 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev,
if (pci_using_dac) if (pci_using_dac)
netdev->features |= NETIF_F_HIGHDMA; netdev->features |= NETIF_F_HIGHDMA;
netdev->priv_flags |= IFF_UNICAST_FLT;
/* The HW MAC address was set and/or determined in sw_init */ /* The HW MAC address was set and/or determined in sw_init */
memcpy(netdev->dev_addr, adapter->hw.mac.addr, netdev->addr_len); memcpy(netdev->dev_addr, adapter->hw.mac.addr, netdev->addr_len);
memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len); memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);

2
drivers/net/ethernet/marvell/mv643xx_eth.c
View File

@ -2923,6 +2923,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_RXCSUM; dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_RXCSUM;
dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM; dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM;
dev->priv_flags |= IFF_UNICAST_FLT;
SET_NETDEV_DEV(dev, &pdev->dev); SET_NETDEV_DEV(dev, &pdev->dev);
if (mp->shared->win_protect) if (mp->shared->win_protect)

3
drivers/net/ethernet/octeon/octeon_mgmt.c
View File

@ -13,6 +13,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/if.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/phy.h> #include <linux/phy.h>
@ -1102,6 +1103,8 @@ static int __devinit octeon_mgmt_probe(struct platform_device *pdev)
tasklet_init(&p->tx_clean_tasklet, tasklet_init(&p->tx_clean_tasklet,
octeon_mgmt_clean_tx_tasklet, (unsigned long)p); octeon_mgmt_clean_tx_tasklet, (unsigned long)p);
netdev->priv_flags |= IFF_UNICAST_FLT;
netdev->netdev_ops = &octeon_mgmt_ops; netdev->netdev_ops = &octeon_mgmt_ops;
netdev->ethtool_ops = &octeon_mgmt_ethtool_ops; netdev->ethtool_ops = &octeon_mgmt_ethtool_ops;

13
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
View File

@ -42,6 +42,7 @@
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/mii.h> #include <linux/mii.h>
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/if.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -1284,7 +1285,7 @@ static int stmmac_config(struct net_device *dev, struct ifmap *map)
} }
/** /**
* stmmac_multicast_list - entry point for multicast addressing * stmmac_set_rx_mode - entry point for multicast addressing
* @dev : pointer to the device structure * @dev : pointer to the device structure
* Description: * Description:
* This function is a driver entry point which gets called by the kernel * This function is a driver entry point which gets called by the kernel
@ -1292,7 +1293,7 @@ static int stmmac_config(struct net_device *dev, struct ifmap *map)
* Return value: * Return value:
* void. * void.
*/ */
static void stmmac_multicast_list(struct net_device *dev) static void stmmac_set_rx_mode(struct net_device *dev)
{ {
struct stmmac_priv *priv = netdev_priv(dev); struct stmmac_priv *priv = netdev_priv(dev);
@ -1421,7 +1422,7 @@ static const struct net_device_ops stmmac_netdev_ops = {
.ndo_stop = stmmac_release, .ndo_stop = stmmac_release,
.ndo_change_mtu = stmmac_change_mtu, .ndo_change_mtu = stmmac_change_mtu,
.ndo_fix_features = stmmac_fix_features, .ndo_fix_features = stmmac_fix_features,
.ndo_set_multicast_list = stmmac_multicast_list, .ndo_set_rx_mode = stmmac_set_rx_mode,
.ndo_tx_timeout = stmmac_tx_timeout, .ndo_tx_timeout = stmmac_tx_timeout,
.ndo_do_ioctl = stmmac_ioctl, .ndo_do_ioctl = stmmac_ioctl,
.ndo_set_config = stmmac_config, .ndo_set_config = stmmac_config,
@ -1498,10 +1499,12 @@ static int stmmac_mac_device_setup(struct net_device *dev)
struct mac_device_info *device; struct mac_device_info *device;
if (priv->plat->has_gmac) if (priv->plat->has_gmac) {
dev->priv_flags |= IFF_UNICAST_FLT;
device = dwmac1000_setup(priv->ioaddr); device = dwmac1000_setup(priv->ioaddr);
else } else {
device = dwmac100_setup(priv->ioaddr); device = dwmac100_setup(priv->ioaddr);
}
if (!device) if (!device)
return -ENOMEM; return -ENOMEM;

5
drivers/net/ethernet/sun/niu.c
View File

@ -17,6 +17,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/mii.h> #include <linux/mii.h>
#include <linux/if.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/ip.h> #include <linux/ip.h>
@ -9716,7 +9717,7 @@ static const struct net_device_ops niu_netdev_ops = {
.ndo_stop = niu_close, .ndo_stop = niu_close,
.ndo_start_xmit = niu_start_xmit, .ndo_start_xmit = niu_start_xmit,
.ndo_get_stats64 = niu_get_stats, .ndo_get_stats64 = niu_get_stats,
.ndo_set_multicast_list = niu_set_rx_mode, .ndo_set_rx_mode = niu_set_rx_mode,
.ndo_validate_addr = eth_validate_addr, .ndo_validate_addr = eth_validate_addr,
.ndo_set_mac_address = niu_set_mac_addr, .ndo_set_mac_address = niu_set_mac_addr,
.ndo_do_ioctl = niu_ioctl, .ndo_do_ioctl = niu_ioctl,
@ -9852,6 +9853,8 @@ static int __devinit niu_pci_init_one(struct pci_dev *pdev,
niu_set_basic_features(dev); niu_set_basic_features(dev);
dev->priv_flags |= IFF_UNICAST_FLT;
np->regs = pci_ioremap_bar(pdev, 0); np->regs = pci_ioremap_bar(pdev, 0);
if (!np->regs) { if (!np->regs) {
dev_err(&pdev->dev, "Cannot map device registers, aborting\n"); dev_err(&pdev->dev, "Cannot map device registers, aborting\n");

1
drivers/net/virtio_net.c
View File

@ -949,6 +949,7 @@ static int virtnet_probe(struct virtio_device *vdev)
return -ENOMEM; return -ENOMEM;
/* Set up network device as normal. */ /* Set up network device as normal. */
dev->priv_flags |= IFF_UNICAST_FLT;
dev->netdev_ops = &virtnet_netdev; dev->netdev_ops = &virtnet_netdev;
dev->features = NETIF_F_HIGHDMA; dev->features = NETIF_F_HIGHDMA;

1
include/linux/if.h
View File

@ -78,6 +78,7 @@
* datapath port */ * datapath port */
#define IFF_TX_SKB_SHARING 0x10000 /* The interface supports sharing #define IFF_TX_SKB_SHARING 0x10000 /* The interface supports sharing
* skbs on transmit */ * skbs on transmit */
#define IFF_UNICAST_FLT 0x20000 /* Supports unicast filtering */
#define IF_GET_IFACE 0x0001 /* for querying only */ #define IF_GET_IFACE 0x0001 /* for querying only */
#define IF_GET_PROTO 0x0002 #define IF_GET_PROTO 0x0002

2
include/linux/netdevice.h
View File

@ -723,6 +723,8 @@ struct netdev_tc_txq {
* *
* void (*ndo_set_rx_mode)(struct net_device *dev); * void (*ndo_set_rx_mode)(struct net_device *dev);
* This function is called device changes address list filtering. * This function is called device changes address list filtering.
* If driver handles unicast address filtering, it should set
* IFF_UNICAST_FLT to its priv_flags.
* *
* void (*ndo_set_multicast_list)(struct net_device *dev); * void (*ndo_set_multicast_list)(struct net_device *dev);
* This function is called when the multicast address list changes. * This function is called when the multicast address list changes.

12
net/core/dev.c
View File

@ -4522,9 +4522,7 @@ void __dev_set_rx_mode(struct net_device *dev)
if (!netif_device_present(dev)) if (!netif_device_present(dev))
return; return;
if (ops->ndo_set_rx_mode) if (!(dev->priv_flags & IFF_UNICAST_FLT)) {
ops->ndo_set_rx_mode(dev);
else {
/* Unicast addresses changes may only happen under the rtnl, /* Unicast addresses changes may only happen under the rtnl,
* therefore calling __dev_set_promiscuity here is safe. * therefore calling __dev_set_promiscuity here is safe.
*/ */
@ -4535,10 +4533,12 @@ void __dev_set_rx_mode(struct net_device *dev)
__dev_set_promiscuity(dev, -1); __dev_set_promiscuity(dev, -1);
dev->uc_promisc = false; dev->uc_promisc = false;
} }
if (ops->ndo_set_multicast_list)
ops->ndo_set_multicast_list(dev);
} }
if (ops->ndo_set_rx_mode)
ops->ndo_set_rx_mode(dev);
else if (ops->ndo_set_multicast_list)
ops->ndo_set_multicast_list(dev);
} }
void dev_set_rx_mode(struct net_device *dev) void dev_set_rx_mode(struct net_device *dev)