cxgb4vf: fix setting unicast/multicast addresses ...
Subsystems (2)
PATCH 1/1 cxgb4vf: fix setting unicast/multicast addresses ...
We were truncating the number of unicast and multicast MAC addresses supported. Additionally, we were incorrectly computing the MAC Address hash (a "1 << N" where we needed a "1ULL << N").
Signed-off-by Casey Leedom <[email protected]>
--- drivers/net/cxgb4vf/cxgb4vf_main.c | 73 +++++++++++++++++---------- drivers/net/cxgb4vf/t4vf_hw.c | 96 ++++++++++++++++++++++------------- 2 files changed, 105 insertions(+), 64 deletions(-)
drivers/net/cxgb4vf/cxgb4vf_main.c +45 -28
@@ -814,40 +814,48 @@ static struct net_device_stats *cxgb4vf_get_stats(struct net_device *dev) }/* -* Collect up to maxaddrs worth of a netdevice's unicast addresses into an -* array of addrss pointers and return the number collected. +* Collect up to maxaddrs worth of a netdevice's unicast addresses, starting +* at a specified offset within the list, into an array of addrss pointers and +* return the number collected. */ -static inline int collect_netdev_uc_list_addrs (const struct net_device *dev, -const u8 **addr, -unsigned int maxaddrs) +static inline unsigned int collect_netdev_uc_list_addrs (const struct net_device *dev, +const u8 **addr, +unsigned int offset, +unsigned int maxaddrs) { +unsigned int index =0 ;unsigned int naddr =0 ;const struct netdev_hw_addr *ha; -for_each_dev_addr (dev, ha) { - addr[naddr++] = ha->addr; -if (naddr >= maxaddrs) -break ; - } +for_each_dev_addr (dev, ha) +if (index++ >= offset) { + addr[naddr++] = ha->addr; +if (naddr >= maxaddrs) +break ; + }return naddr; }/* -* Collect up to maxaddrs worth of a netdevice's multicast addresses into an -* array of addrss pointers and return the number collected. +* Collect up to maxaddrs worth of a netdevice's multicast addresses, starting +* at a specified offset within the list, into an array of addrss pointers and +* return the number collected. */ -static inline int collect_netdev_mc_list_addrs (const struct net_device *dev, -const u8 **addr, -unsigned int maxaddrs) +static inline unsigned int collect_netdev_mc_list_addrs (const struct net_device *dev, +const u8 **addr, +unsigned int offset, +unsigned int maxaddrs) { +unsigned int index =0 ;unsigned int naddr =0 ;const struct netdev_hw_addr *ha; -netdev_for_each_mc_addr (ha, dev) { - addr[naddr++] = ha->addr; -if (naddr >= maxaddrs) -break ; - } +netdev_for_each_mc_addr (ha, dev) +if (index++ >= offset) { + addr[naddr++] = ha->addr; +if (naddr >= maxaddrs) +break ; + }return naddr; }
@@ -860,16 +868,20 @@ static int set_addr_filters(const struct net_device *dev, bool sleep)u64 mhash =0 ;u64 uhash =0 ;bool free = true; -u16 filt_idx[7 ]; +unsigned int offset, naddr;const u8 *addr[7 ]; -int ret, naddr =0 ; +int ret;const struct port_info *pi =netdev_priv (dev);/* first do the secondary unicast addresses */ - naddr =collect_netdev_uc_list_addrs (dev, addr,ARRAY_SIZE (addr)); -if (naddr >0 ) { +for (offset =0 ; ; offset += naddr) { + naddr =collect_netdev_uc_list_addrs (dev, addr, offset, +ARRAY_SIZE (addr)); +if (naddr ==0 ) +break ; + ret =t4vf_alloc_mac_filt (pi->adapter, pi->viid, free, - naddr, addr, filt_idx, &uhash, sleep); + naddr, addr,NULL , &uhash, sleep);if (ret <0 )return ret;
@@ -877,12 +889,17 @@ static int set_addr_filters(const struct net_device *dev, bool sleep) }/* next set up the multicast addresses */ - naddr =collect_netdev_mc_list_addrs (dev, addr,ARRAY_SIZE (addr)); -if (naddr >0 ) { +for (offset =0 ; ; offset += naddr) { + naddr =collect_netdev_mc_list_addrs (dev, addr, offset, +ARRAY_SIZE (addr)); +if (naddr ==0 ) +break ; + ret =t4vf_alloc_mac_filt (pi->adapter, pi->viid, free, - naddr, addr, filt_idx, &mhash, sleep); + naddr, addr,NULL , &mhash, sleep);if (ret <0 )return ret; + free = false; } return t4vf_set_addr_hash(pi->adapter, pi->viid, uhash != 0,
drivers/net/cxgb4vf/t4vf_hw.c +59 -35
107 lines not on this page · raw message
Signature · 1 line
1.7.0.4
David Miller
maintainerFrom: Casey Leedom <[email protected]>
Date: Wed, 24 Nov 2010 14:23:57 -0800
Quoted 5 lines
We were truncating the number of unicast and multicast MAC addresses supported. Additionally, we were incorrectly computing the MAC Address hash (a "1 << N" where we needed a "1ULL << N").
Signed-off-by Casey Leedom <[email protected]>
I'll apply this, thanks.