aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/dl2k.c
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2010-02-07 23:30:35 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-12 14:38:58 -0500
commit4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5 (patch)
tree99f57f6374a58022e1e5ed1cbc12699288c7eae1 /drivers/net/dl2k.c
parent8e5574211d96c0552f84c757718475fdb4021be7 (diff)
net: use netdev_mc_count and netdev_mc_empty when appropriate
This patch replaces dev->mc_count in all drivers (hopefully I didn't miss anything). Used spatch and did small tweaks and conding style changes when it was suitable. Jirka Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dl2k.c')
-rw-r--r--drivers/net/dl2k.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index 2a8b6a7c0b87..dea40953ed1b 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -1128,17 +1128,17 @@ set_multicast (struct net_device *dev)
1128 /* Receive all frames promiscuously. */ 1128 /* Receive all frames promiscuously. */
1129 rx_mode = ReceiveAllFrames; 1129 rx_mode = ReceiveAllFrames;
1130 } else if ((dev->flags & IFF_ALLMULTI) || 1130 } else if ((dev->flags & IFF_ALLMULTI) ||
1131 (dev->mc_count > multicast_filter_limit)) { 1131 (netdev_mc_count(dev) > multicast_filter_limit)) {
1132 /* Receive broadcast and multicast frames */ 1132 /* Receive broadcast and multicast frames */
1133 rx_mode = ReceiveBroadcast | ReceiveMulticast | ReceiveUnicast; 1133 rx_mode = ReceiveBroadcast | ReceiveMulticast | ReceiveUnicast;
1134 } else if (dev->mc_count > 0) { 1134 } else if (!netdev_mc_empty(dev)) {
1135 int i; 1135 int i;
1136 struct dev_mc_list *mclist; 1136 struct dev_mc_list *mclist;
1137 /* Receive broadcast frames and multicast frames filtering 1137 /* Receive broadcast frames and multicast frames filtering
1138 by Hashtable */ 1138 by Hashtable */
1139 rx_mode = 1139 rx_mode =
1140 ReceiveBroadcast | ReceiveMulticastHash | ReceiveUnicast; 1140 ReceiveBroadcast | ReceiveMulticastHash | ReceiveUnicast;
1141 for (i=0, mclist = dev->mc_list; mclist && i < dev->mc_count; 1141 for (i=0, mclist = dev->mc_list; mclist && i < netdev_mc_count(dev);
1142 i++, mclist=mclist->next) 1142 i++, mclist=mclist->next)
1143 { 1143 {
1144 int bit, index = 0; 1144 int bit, index = 0;