diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-06-18 08:51:12 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-07-10 15:01:41 -0400 |
commit | 90e3012e94be0755a516f60f5339a2a08f4a7d0a (patch) | |
tree | 0b9cb4ea1da7f9de98bf0abd1e81133d7eeed484 /drivers/net/wireless/mac80211_hwsim.c | |
parent | 3bfbe80e4462c22e5dc42a00b2b394e347f4aa09 (diff) |
mac80211_hwsim: clean up the skb before passing it back
We need to clean up the skb before we can copy it, this
is required for proper operation since the socket it is
still attached to could potentially live in a different
network namespace or so.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mac80211_hwsim.c')
-rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index b1e4baec29f4..1b59edc916c0 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c | |||
@@ -15,6 +15,8 @@ | |||
15 | 15 | ||
16 | #include <linux/list.h> | 16 | #include <linux/list.h> |
17 | #include <linux/spinlock.h> | 17 | #include <linux/spinlock.h> |
18 | #include <net/dst.h> | ||
19 | #include <net/xfrm.h> | ||
18 | #include <net/mac80211.h> | 20 | #include <net/mac80211.h> |
19 | #include <net/ieee80211_radiotap.h> | 21 | #include <net/ieee80211_radiotap.h> |
20 | #include <linux/if_arp.h> | 22 | #include <linux/if_arp.h> |
@@ -409,6 +411,14 @@ static bool mac80211_hwsim_tx_frame(struct ieee80211_hw *hw, | |||
409 | if (data->ps != PS_DISABLED) | 411 | if (data->ps != PS_DISABLED) |
410 | hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PM); | 412 | hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PM); |
411 | 413 | ||
414 | /* release the skb's source info */ | ||
415 | skb_orphan(skb); | ||
416 | dst_release(skb->dst); | ||
417 | skb->dst = NULL; | ||
418 | skb->mark = 0; | ||
419 | secpath_reset(skb); | ||
420 | nf_reset(skb); | ||
421 | |||
412 | /* Copy skb to all enabled radios that are on the current frequency */ | 422 | /* Copy skb to all enabled radios that are on the current frequency */ |
413 | spin_lock(&hwsim_radio_lock); | 423 | spin_lock(&hwsim_radio_lock); |
414 | list_for_each_entry(data2, &hwsim_radios, list) { | 424 | list_for_each_entry(data2, &hwsim_radios, list) { |