mac80211: decrement ref count to netdev after launching mesh discovery

commit 5dc306f3bd1d4cfdf79df39221b3036eab1ddcf3 upstream.

After launching mesh discovery in tx path, reference count was not being
decremented.  This was preventing module unload.

Signed-off-by: Brian Cavagnolo <brian@cozybit.com>
Signed-off-by: Andrey Yurovsky <andrey@cozybit.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 4788f7b91f493fa64ae664bad13e69488fddba6a..56ad58dc01efec792e855e842b5de877a71b84e5 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1335,8 +1335,10 @@ int ieee80211_master_start_xmit(struct sk_buff *skb,
                        if (is_multicast_ether_addr(hdr->addr3))
                                memcpy(hdr->addr1, hdr->addr3, ETH_ALEN);
                        else
-                               if (mesh_nexthop_lookup(skb, odev))
+                               if (mesh_nexthop_lookup(skb, odev)) {
+                                       dev_put(odev);
                                        return  0;
+                               }
                        if (memcmp(odev->dev_addr, hdr->addr4, ETH_ALEN) != 0)
                                IEEE80211_IFSTA_MESH_CTR_INC(&osdata->u.sta,
                                                             fwded_frames);