From 4119922dcd2dd62c0ff751f6f798e91c3ef7053c Mon Sep 17 00:00:00 2001
From: Brian Cavagnolo <brian@cozybit.com>
Date: Fri, 16 Jan 2009 19:04:49 -0800
Subject: [PATCH] --- yaml --- r: 130167 b: refs/heads/master c:
 5dc306f3bd1d4cfdf79df39221b3036eab1ddcf3 h: refs/heads/master i:   130165:
 7e639351bb31146cbb5eb94886b50d50d77b0aa2   130163:
 73c11dcdced6e2d566f62eb94f5166f1370f2483   130159:
 e5b0bc7eb205f9ea85f6623f98fa94c102729b63 v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/tx.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5a0904db2d06..7916b8673c61 100644
--- 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
index a4af3a124cce..4278e545638f 100644
--- 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);