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 /net/bluetooth | |
| 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 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/bnep/netdev.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c index 26fb831ef7e0..b6234b73c4cf 100644 --- a/net/bluetooth/bnep/netdev.c +++ b/net/bluetooth/bnep/netdev.c | |||
| @@ -64,7 +64,7 @@ static void bnep_net_set_mc_list(struct net_device *dev) | |||
| 64 | struct sk_buff *skb; | 64 | struct sk_buff *skb; |
| 65 | int size; | 65 | int size; |
| 66 | 66 | ||
| 67 | BT_DBG("%s mc_count %d", dev->name, dev->mc_count); | 67 | BT_DBG("%s mc_count %d", dev->name, netdev_mc_count(dev)); |
| 68 | 68 | ||
| 69 | size = sizeof(*r) + (BNEP_MAX_MULTICAST_FILTERS + 1) * ETH_ALEN * 2; | 69 | size = sizeof(*r) + (BNEP_MAX_MULTICAST_FILTERS + 1) * ETH_ALEN * 2; |
| 70 | skb = alloc_skb(size, GFP_ATOMIC); | 70 | skb = alloc_skb(size, GFP_ATOMIC); |
| @@ -97,7 +97,9 @@ static void bnep_net_set_mc_list(struct net_device *dev) | |||
| 97 | 97 | ||
| 98 | /* FIXME: We should group addresses here. */ | 98 | /* FIXME: We should group addresses here. */ |
| 99 | 99 | ||
| 100 | for (i = 0; i < dev->mc_count && i < BNEP_MAX_MULTICAST_FILTERS; i++) { | 100 | for (i = 0; |
| 101 | i < netdev_mc_count(dev) && i < BNEP_MAX_MULTICAST_FILTERS; | ||
| 102 | i++) { | ||
| 101 | memcpy(__skb_put(skb, ETH_ALEN), dmi->dmi_addr, ETH_ALEN); | 103 | memcpy(__skb_put(skb, ETH_ALEN), dmi->dmi_addr, ETH_ALEN); |
| 102 | memcpy(__skb_put(skb, ETH_ALEN), dmi->dmi_addr, ETH_ALEN); | 104 | memcpy(__skb_put(skb, ETH_ALEN), dmi->dmi_addr, ETH_ALEN); |
| 103 | dmi = dmi->next; | 105 | dmi = dmi->next; |
