On Fri, 2009-01-16 at 19:04 -0800, Brian Cavagnolo wrote: > After launching mesh discovery in tx path, reference count was not being > decremented. This was preventing module unload. > > Signed-off-by: Brian Cavagnolo <brian@xxxxxxxxxxx> > Signed-off-by: Andrey Yurovsky <andrey@xxxxxxxxxxx> Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> > --- > net/mac80211/tx.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c > index a7392af..d0ae7f0 100644 > --- a/net/mac80211/tx.c > +++ b/net/mac80211/tx.c > @@ -1358,8 +1358,10 @@ int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev) > if (is_multicast_ether_addr(hdr->addr3)) > memcpy(hdr->addr1, hdr->addr3, ETH_ALEN); > else > - if (mesh_nexthop_lookup(skb, osdata)) > - return 0; > + if (mesh_nexthop_lookup(skb, osdata)) { > + dev_put(odev); > + return 0; > + } > if (memcmp(odev->dev_addr, hdr->addr4, ETH_ALEN) != 0) > IEEE80211_IFSTA_MESH_CTR_INC(&osdata->u.mesh, > fwded_frames);
Attachment:
signature.asc
Description: This is a digitally signed message part