diff options
Diffstat (limited to 'net/bluetooth/bnep/netdev.c')
-rw-r--r-- | net/bluetooth/bnep/netdev.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c index 326ab453edb7..d48b33f4d4ba 100644 --- a/net/bluetooth/bnep/netdev.c +++ b/net/bluetooth/bnep/netdev.c | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
29 | #include <linux/slab.h> | ||
29 | 30 | ||
30 | #include <linux/socket.h> | 31 | #include <linux/socket.h> |
31 | #include <linux/netdevice.h> | 32 | #include <linux/netdevice.h> |
@@ -87,7 +88,7 @@ static void bnep_net_set_mc_list(struct net_device *dev) | |||
87 | memcpy(__skb_put(skb, ETH_ALEN), dev->broadcast, ETH_ALEN); | 88 | memcpy(__skb_put(skb, ETH_ALEN), dev->broadcast, ETH_ALEN); |
88 | r->len = htons(ETH_ALEN * 2); | 89 | r->len = htons(ETH_ALEN * 2); |
89 | } else { | 90 | } else { |
90 | struct dev_mc_list *dmi; | 91 | struct netdev_hw_addr *ha; |
91 | int i, len = skb->len; | 92 | int i, len = skb->len; |
92 | 93 | ||
93 | if (dev->flags & IFF_BROADCAST) { | 94 | if (dev->flags & IFF_BROADCAST) { |
@@ -98,11 +99,11 @@ static void bnep_net_set_mc_list(struct net_device *dev) | |||
98 | /* FIXME: We should group addresses here. */ | 99 | /* FIXME: We should group addresses here. */ |
99 | 100 | ||
100 | i = 0; | 101 | i = 0; |
101 | netdev_for_each_mc_addr(dmi, dev) { | 102 | netdev_for_each_mc_addr(ha, dev) { |
102 | if (i == BNEP_MAX_MULTICAST_FILTERS) | 103 | if (i == BNEP_MAX_MULTICAST_FILTERS) |
103 | break; | 104 | break; |
104 | memcpy(__skb_put(skb, ETH_ALEN), dmi->dmi_addr, ETH_ALEN); | 105 | memcpy(__skb_put(skb, ETH_ALEN), ha->addr, ETH_ALEN); |
105 | memcpy(__skb_put(skb, ETH_ALEN), dmi->dmi_addr, ETH_ALEN); | 106 | memcpy(__skb_put(skb, ETH_ALEN), ha->addr, ETH_ALEN); |
106 | } | 107 | } |
107 | r->len = htons(skb->len - len); | 108 | r->len = htons(skb->len - len); |
108 | } | 109 | } |