---

yaml --- r: 130167 b: refs/heads/master c: 5dc306f h: refs/heads/master i: 130165: 7e63935 130163: 73c11dc 130159: e5b0bc7 v: v3
git-mirror · Jan 22, 2009 · 4119922 · 4119922
1 parent 931a2a2
commit 4119922
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d317482944250228255bcbe97a95b7e7ad9a538
+refs/heads/master: 5dc306f3bd1d4cfdf79df39221b3036eab1ddcf3
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
@@ -1307,8 +1307,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);