diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-09 17:19:21 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-09 17:19:21 +0100 |
| commit | 2a074f4a54d11ec0ce16b35e9a88feaa2fd886aa (patch) | |
| tree | b81ab05dac66fa0cccf44896d2d86be7ba52aa49 /net/mac80211/tx.c | |
| parent | 23c7b521c250b261dd97a7a06d5a2e74b56233d5 (diff) | |
| parent | 8bd4bb7a35e8ebb015a531218614c48e10a3c4ee (diff) | |
| download | linux-stable-2a074f4a54d11ec0ce16b35e9a88feaa2fd886aa.tar.gz linux-stable-2a074f4a54d11ec0ce16b35e9a88feaa2fd886aa.tar.bz2 linux-stable-2a074f4a54d11ec0ce16b35e9a88feaa2fd886aa.zip | |
Merge branch 'topic/quirk-cleanup' into topic/hda
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | 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 a4af3a124cce..4278e545638f 100644 --- a/net/mac80211/tx.c +++ b/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); |