diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-02-07 23:30:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-12 14:38:58 -0500 |
commit | 4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5 (patch) | |
tree | 99f57f6374a58022e1e5ed1cbc12699288c7eae1 /drivers/media | |
parent | 8e5574211d96c0552f84c757718475fdb4021be7 (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/media')
-rw-r--r-- | drivers/media/dvb/dvb-core/dvb_net.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c index da6552d32cfe..37d8579fc7a9 100644 --- a/drivers/media/dvb/dvb-core/dvb_net.c +++ b/drivers/media/dvb/dvb-core/dvb_net.c | |||
@@ -1138,18 +1138,18 @@ static void wq_set_multicast_list (struct work_struct *work) | |||
1138 | } else if ((dev->flags & IFF_ALLMULTI)) { | 1138 | } else if ((dev->flags & IFF_ALLMULTI)) { |
1139 | dprintk("%s: allmulti mode\n", dev->name); | 1139 | dprintk("%s: allmulti mode\n", dev->name); |
1140 | priv->rx_mode = RX_MODE_ALL_MULTI; | 1140 | priv->rx_mode = RX_MODE_ALL_MULTI; |
1141 | } else if (dev->mc_count) { | 1141 | } else if (!netdev_mc_empty(dev)) { |
1142 | int mci; | 1142 | int mci; |
1143 | struct dev_mc_list *mc; | 1143 | struct dev_mc_list *mc; |
1144 | 1144 | ||
1145 | dprintk("%s: set_mc_list, %d entries\n", | 1145 | dprintk("%s: set_mc_list, %d entries\n", |
1146 | dev->name, dev->mc_count); | 1146 | dev->name, netdev_mc_count(dev)); |
1147 | 1147 | ||
1148 | priv->rx_mode = RX_MODE_MULTI; | 1148 | priv->rx_mode = RX_MODE_MULTI; |
1149 | priv->multi_num = 0; | 1149 | priv->multi_num = 0; |
1150 | 1150 | ||
1151 | for (mci = 0, mc=dev->mc_list; | 1151 | for (mci = 0, mc=dev->mc_list; |
1152 | mci < dev->mc_count; | 1152 | mci < netdev_mc_count(dev); |
1153 | mc = mc->next, mci++) { | 1153 | mc = mc->next, mci++) { |
1154 | dvb_set_mc_filter(dev, mc); | 1154 | dvb_set_mc_filter(dev, mc); |
1155 | } | 1155 | } |
@@ -1236,7 +1236,6 @@ static void dvb_net_setup(struct net_device *dev) | |||
1236 | dev->header_ops = &dvb_header_ops; | 1236 | dev->header_ops = &dvb_header_ops; |
1237 | dev->netdev_ops = &dvb_netdev_ops; | 1237 | dev->netdev_ops = &dvb_netdev_ops; |
1238 | dev->mtu = 4096; | 1238 | dev->mtu = 4096; |
1239 | dev->mc_count = 0; | ||
1240 | 1239 | ||
1241 | dev->flags |= IFF_NOARP; | 1240 | dev->flags |= IFF_NOARP; |
1242 | } | 1241 | } |