* [PATCH] mac80211: decrement ref count to netdev after launching mesh discovery
[not found] <mesh netdev decrement>
@ 2009-01-17 3:04 ` Brian Cavagnolo
2009-01-17 9:25 ` Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: Brian Cavagnolo @ 2009-01-17 3:04 UTC (permalink / raw)
To: linux-wireless; +Cc: johannes
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>
---
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);
--
1.5.5.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mac80211: decrement ref count to netdev after launching mesh discovery
2009-01-17 3:04 ` [PATCH] mac80211: decrement ref count to netdev after launching mesh discovery Brian Cavagnolo
@ 2009-01-17 9:25 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2009-01-17 9:25 UTC (permalink / raw)
To: Brian Cavagnolo; +Cc: linux-wireless
[-- Attachment #1: Type: text/plain, Size: 1115 bytes --]
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@cozybit.com>
> Signed-off-by: Andrey Yurovsky <andrey@cozybit.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
> ---
> 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 #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-01-17 9:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <mesh netdev decrement>
2009-01-17 3:04 ` [PATCH] mac80211: decrement ref count to netdev after launching mesh discovery Brian Cavagnolo
2009-01-17 9:25 ` Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox