Message ID | 1276907040-23229-1-git-send-email-padovan@profusion.mobi |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
* Gustavo F. Padovan <padovan@profusion.mobi> [2010-06-18 21:24:00 -0300]: > commit ff6e2163f28a1094fb5ca5950fe2b43c3cf6bc7a accidentally added a > regression on the bnep code. Fixing it. > > Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> > --- > 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 0faad5c..8c100c9 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) > break; > memcpy(__skb_put(skb, ETH_ALEN), ha->addr, ETH_ALEN); > memcpy(__skb_put(skb, ETH_ALEN), ha->addr, ETH_ALEN); > + > + i++; > } > r->len = htons(skb->len - len); > } > -- Marcel, if you want I can carry the fix on my tree for -next.
From: "Gustavo F. Padovan" <gustavo@padovan.org> Date: Fri, 18 Jun 2010 21:28:07 -0300 > * Gustavo F. Padovan <padovan@profusion.mobi> [2010-06-18 21:24:00 -0300]: > >> commit ff6e2163f28a1094fb5ca5950fe2b43c3cf6bc7a accidentally added a >> regression on the bnep code. Fixing it. >> >> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> ... > Marcel, if you want I can carry the fix on my tree for -next. I'll apply this bug fix to net-2.6 so it doesn't just rot like it is currently. Thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c index 0faad5c..8c100c9 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) break; memcpy(__skb_put(skb, ETH_ALEN), ha->addr, ETH_ALEN); memcpy(__skb_put(skb, ETH_ALEN), ha->addr, ETH_ALEN); + + i++; } r->len = htons(skb->len - len); }
commit ff6e2163f28a1094fb5ca5950fe2b43c3cf6bc7a accidentally added a regression on the bnep code. Fixing it. Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> --- net/bluetooth/bnep/netdev.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)