net: convert to use mc helpers round 1
cover net: convert to use mc helpers round 1
Hi.
I started with drivers I use daily. There are four of them.
Jirka
PATCH 1/4 net: 8139cp: convert to use mc helpers
Signed-off-by Jiri Pirko <[email protected]>
--- drivers/net/8139cp.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
drivers/net/8139cp.c +3 -4
@@ -899,7 +899,7 @@ static void __cp_set_rx_mode (struct net_device *dev) {struct cp_private *cp =netdev_priv (dev);u32 mc_filter[2 ];/* Multicast hash filter */ -int i, rx_mode; +int rx_mode;u32 tmp;/* Note: do not reorder, GCC is clever about common statements. */
@@ -909,7 +909,7 @@ static void __cp_set_rx_mode (struct net_device *dev) AcceptBroadcast | AcceptMulticast | AcceptMyPhys | AcceptAllPhys; mc_filter[1 ] = mc_filter[0 ] =0xffffffff ; - }else if ((dev->mc_count > multicast_filter_limit) || + }else if ((netdev_mc_count (dev) > multicast_filter_limit) || (dev->flags &IFF_ALLMULTI )) {/* Too many to filter perfectly -- accept all multicasts. */ rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
@@ -918,8 +918,7 @@ static void __cp_set_rx_mode (struct net_device *dev)struct dev_mc_list *mclist; rx_mode = AcceptBroadcast | AcceptMyPhys; mc_filter[1 ] = mc_filter[0 ] =0 ; -for (i =0 , mclist = dev->mc_list; mclist && i < dev->mc_count; - i++, mclist = mclist->next) { +netdev_for_each_mc_addr (mclist, dev) {int bit_nr =ether_crc (ETH_ALEN , mclist->dmi_addr) >>26 ; mc_filter[bit_nr >>5 ] |=1 << (bit_nr &31 );
Signature · 1 line
1.6.6
PATCH 2/4 net: 8139too: convert to use mc helpers
In reply to Jiri PirkoSigned-off-by Jiri Pirko <[email protected]>
--- drivers/net/8139too.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
drivers/net/8139too.c +3 -4
@@ -2509,7 +2509,7 @@ static void __set_rx_mode (struct net_device *dev)struct rtl8139_private *tp =netdev_priv (dev);void __iomem *ioaddr = tp->mmio_addr;u32 mc_filter[2 ];/* Multicast hash filter */ -int i, rx_mode; +int rx_mode;u32 tmp; pr_debug("%s: rtl8139_set_rx_mode(%4.4x) done -- Rx config %8.8lx.\n",
@@ -2521,7 +2521,7 @@ static void __set_rx_mode (struct net_device *dev) AcceptBroadcast | AcceptMulticast | AcceptMyPhys | AcceptAllPhys; mc_filter[1 ] = mc_filter[0 ] =0xffffffff ; - }else if ((dev->mc_count > multicast_filter_limit) || + }else if ((netdev_mc_count (dev) > multicast_filter_limit) || (dev->flags &IFF_ALLMULTI )) {/* Too many to filter perfectly -- accept all multicasts. */ rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
@@ -2530,8 +2530,7 @@ static void __set_rx_mode (struct net_device *dev)struct dev_mc_list *mclist; rx_mode = AcceptBroadcast | AcceptMyPhys; mc_filter[1 ] = mc_filter[0 ] =0 ; -for (i =0 , mclist = dev->mc_list; mclist && i < dev->mc_count; - i++, mclist = mclist->next) { +netdev_for_each_mc_addr (mclist, dev) {int bit_nr =ether_crc (ETH_ALEN , mclist->dmi_addr) >>26 ; mc_filter[bit_nr >>5 ] |=1 << (bit_nr &31 );
Signature · 1 line
1.6.6
PATCH 3/4 net: dm9601: convert to use mc helpers
In reply to Jiri PirkoSigned-off-by Jiri Pirko <[email protected]>
--- drivers/net/usb/dm9601.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/usb/dm9601.c +5 -5
@@ -381,13 +381,13 @@ static void dm9601_set_multicast(struct net_device *net)if (net->flags &IFF_PROMISC ) { rx_ctl |=0x02 ; - }else if (net->flags &IFF_ALLMULTI || net->mc_count >DM_MAX_MCAST ) { + }else if (net->flags &IFF_ALLMULTI || +netdev_mc_count (net) >DM_MAX_MCAST ) { rx_ctl |=0x04 ; - }else if (net->mc_count) { -struct dev_mc_list *mc_list = net->mc_list; -int i; + }else if (!netdev_mc_empty (net)) { +struct dev_mc_list *mc_list; -for (i =0 ; i < net->mc_count; i++, mc_list = mc_list->next) { +netdev_for_each_mc_addr (mc_list, net) {u32 crc =ether_crc (ETH_ALEN , mc_list->dmi_addr) >>26 ; hashes[crc >>3 ] |=1 << (crc &0x7 ); }
Signature · 1 line
1.6.6
PATCH 4/4 net: e1000e: convert to use mc helpers
In reply to Jiri PirkoSigned-off-by Jiri Pirko <[email protected]>
--- drivers/net/e1000e/netdev.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-)
drivers/net/e1000e/netdev.c +6 -11
@@ -2589,21 +2589,16 @@ static void e1000_set_multi(struct net_device *netdev)ew32 (RCTL , rctl); -if (netdev->mc_count) { - mta_list =kmalloc (netdev->mc_count *6 ,GFP_ATOMIC ); +if (!netdev_mc_empty (netdev)) { + mta_list =kmalloc (netdev_mc_count (netdev) *6 ,GFP_ATOMIC );if (!mta_list)return ;/* prepare a packed array of only addresses. */ - mc_ptr = netdev->mc_list; - -for (i =0 ; i < netdev->mc_count; i++) { -if (!mc_ptr) -break ; -memcpy (mta_list + (i*ETH_ALEN ), mc_ptr->dmi_addr, -ETH_ALEN ); - mc_ptr = mc_ptr->next; - } + i =0 ; +netdev_for_each_mc_addr (mc_ptr, netdev) +memcpy (mta_list + (i++ *ETH_ALEN ), + mc_ptr->dmi_addr,ETH_ALEN );e1000_update_mc_addr_list (hw, mta_list, i);kfree (mta_list);
Signature · 1 line
1.6.6
David Miller
maintainerFrom: Jiri Pirko <[email protected]>
Date: Fri, 5 Feb 2010 13:46:23 +0100
Quoted 1 line
I started with drivers I use daily. There are four of them.
Looks good, all applied to net-next-2.6, thanks.