diff options
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/bnep/netdev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c index 326ab453edb7..260a9507e542 100644 --- a/net/bluetooth/bnep/netdev.c +++ b/net/bluetooth/bnep/netdev.c | |||
| @@ -87,7 +87,7 @@ static void bnep_net_set_mc_list(struct net_device *dev) | |||
| 87 | memcpy(__skb_put(skb, ETH_ALEN), dev->broadcast, ETH_ALEN); | 87 | memcpy(__skb_put(skb, ETH_ALEN), dev->broadcast, ETH_ALEN); |
| 88 | r->len = htons(ETH_ALEN * 2); | 88 | r->len = htons(ETH_ALEN * 2); |
| 89 | } else { | 89 | } else { |
| 90 | struct dev_mc_list *dmi; | 90 | struct netdev_hw_addr *ha; |
| 91 | int i, len = skb->len; | 91 | int i, len = skb->len; |
| 92 | 92 | ||
| 93 | if (dev->flags & IFF_BROADCAST) { | 93 | if (dev->flags & IFF_BROADCAST) { |
| @@ -98,11 +98,11 @@ static void bnep_net_set_mc_list(struct net_device *dev) | |||
| 98 | /* FIXME: We should group addresses here. */ | 98 | /* FIXME: We should group addresses here. */ |
| 99 | 99 | ||
| 100 | i = 0; | 100 | i = 0; |
| 101 | netdev_for_each_mc_addr(dmi, dev) { | 101 | netdev_for_each_mc_addr(ha, dev) { |
| 102 | if (i == BNEP_MAX_MULTICAST_FILTERS) | 102 | if (i == BNEP_MAX_MULTICAST_FILTERS) |
| 103 | break; | 103 | break; |
| 104 | memcpy(__skb_put(skb, ETH_ALEN), dmi->dmi_addr, ETH_ALEN); | 104 | memcpy(__skb_put(skb, ETH_ALEN), ha->addr, ETH_ALEN); |
| 105 | memcpy(__skb_put(skb, ETH_ALEN), dmi->dmi_addr, ETH_ALEN); | 105 | memcpy(__skb_put(skb, ETH_ALEN), ha->addr, ETH_ALEN); |
| 106 | } | 106 | } |
| 107 | r->len = htons(skb->len - len); | 107 | r->len = htons(skb->len - len); |
| 108 | } | 108 | } |
