diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-07 18:59:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-07 18:59:38 -0400 |
| commit | 597e608a8492d662736c9bc6aa507dbf1cadc17d (patch) | |
| tree | 6c330cdd0a4809f67dd191b37e34f5b4318cef78 /net/bluetooth | |
| parent | acbc0f039ff4b93da737c91937b7c70018ded39f (diff) | |
| parent | 33b665eeeb85956ccbdf31c4c31a4e2a31133c44 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/bnep/netdev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c index 0faad5ce6dc4..8c100c9dae28 100644 --- a/net/bluetooth/bnep/netdev.c +++ b/net/bluetooth/bnep/netdev.c | |||
| @@ -104,6 +104,8 @@ static void bnep_net_set_mc_list(struct net_device *dev) | |||
| 104 | break; | 104 | break; |
| 105 | memcpy(__skb_put(skb, ETH_ALEN), ha->addr, ETH_ALEN); | 105 | memcpy(__skb_put(skb, ETH_ALEN), ha->addr, ETH_ALEN); |
| 106 | memcpy(__skb_put(skb, ETH_ALEN), ha->addr, ETH_ALEN); | 106 | memcpy(__skb_put(skb, ETH_ALEN), ha->addr, ETH_ALEN); |
| 107 | |||
| 108 | i++; | ||
| 107 | } | 109 | } |
| 108 | r->len = htons(skb->len - len); | 110 | r->len = htons(skb->len - len); |
| 109 | } | 111 | } |