Patchwork mac80211_hwsim: clean up the skb before passing it back

login
register
mail settings
Submitter Johannes Berg
Date June 18, 2009, 12:51 p.m.
Message ID <1245329472.13790.33.camel@johannes.local>
Download mbox | patch
Permalink /patch/28864/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Johannes Berg - June 18, 2009, 12:51 p.m.
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>
---
I stole this code from veth, maybe there should be a function somewhere?

 drivers/net/wireless/mac80211_hwsim.c |   10 ++++++++++
 1 file changed, 10 insertions(+)



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- wireless-testing.orig/drivers/net/wireless/mac80211_hwsim.c	2009-06-18 14:42:01.000000000 +0200
+++ wireless-testing/drivers/net/wireless/mac80211_hwsim.c	2009-06-18 14:44:27.000000000 +0200
@@ -15,6 +15,8 @@ 
 
 #include <linux/list.h>
 #include <linux/spinlock.h>
+#include <net/dst.h>
+#include <net/xfrm.h>
 #include <net/mac80211.h>
 #include <net/ieee80211_radiotap.h>
 #include <linux/if_arp.h>
@@ -409,6 +411,14 @@  static bool mac80211_hwsim_tx_frame(stru
 	if (data->ps != PS_DISABLED)
 		hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PM);
 
+	/* release the skb's source info */
+	skb_orphan(skb);
+	dst_release(skb->dst);
+	skb->dst = NULL;
+	skb->mark = 0;
+	secpath_reset(skb);
+	nf_reset(skb);
+
 	/* Copy skb to all enabled radios that are on the current frequency */
 	spin_lock(&hwsim_radio_lock);
 	list_for_each_entry(data2, &hwsim_radios, list) {