---

yaml --- r: 202999 b: refs/heads/master c: 36b3a62 h: refs/heads/master i: 202997: adf851e 202995: f53c663 202991: 71c0051 v: v3
git-mirror · Jun 14, 2010 · c30214b · c30214b
1 parent d01aeb2
commit c30214b
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fa57d017366fb26b58af110a38b36a4f0214a62
+refs/heads/master: 36b3a628a4e85d002ee8813ebd2a5caef6d3c1a7
diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c
@@ -754,8 +754,6 @@ void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
 		ieee80211_rx_mgmt_auth_ibss(sdata, mgmt, skb->len);
 		break;
 	}
-
-	kfree_skb(skb);
 }
 
 void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata)

diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
@@ -738,9 +738,10 @@ static void ieee80211_iface_work(struct work_struct *work)
 			break;
 		default:
 			WARN(1, "frame for unexpected interface type");
-			kfree_skb(skb);
 			break;
 		}
+
+		kfree_skb(skb);
 	}
 
 	/* then other type-dependent work */

diff --git a/trunk/net/mac80211/mesh.c b/trunk/net/mac80211/mesh.c
@@ -620,8 +620,6 @@ void ieee80211_mesh_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
 		ieee80211_mesh_rx_mgmt_action(sdata, mgmt, skb->len, rx_status);
 		break;
 	}
-
-	kfree_skb(skb);
 }
 
 void ieee80211_mesh_work(struct ieee80211_sub_if_data *sdata)

diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
@@ -1754,17 +1754,14 @@ void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
 		default:
 			WARN(1, "unexpected: %d", rma);
 		}
-		goto out;
+		return;
 	}
 
 	mutex_unlock(&ifmgd->mtx);
 
 	if (skb->len >= 24 + 2 /* mgmt + deauth reason */ &&
 	    (fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_DEAUTH)
 		cfg80211_send_deauth(sdata->dev, (u8 *)mgmt, skb->len);
-
- out:
-	kfree_skb(skb);
 }
 
 static void ieee80211_sta_timer(unsigned long data)
-Original file line number
+Diff line change
@@ Expand Up @@
     		ieee80211_rx_mgmt_auth_ibss(sdata, mgmt, skb->len);
     		break;
     	}
-    	kfree_skb(skb);
     }
     void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata)
@@ Expand Down @@