---

yaml --- r: 223196 b: refs/heads/master c: 8e26d5a h: refs/heads/master v: v3
git-mirror · Nov 30, 2010 · 619efe7 · 619efe7
1 parent e7cfe60
commit 619efe7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c31333a8fde7e26936a9f5371d02ff12c490993
+refs/heads/master: 8e26d5ad2f9c038609d42eebc676cd1107709eef
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
@@ -2745,6 +2745,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
 
 			if (ieee80211_prepare_and_rx_handle(&rx, skb, true))
 				return;
+			goto out;
 		}
 	}
 
@@ -2784,6 +2785,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
 			return;
 	}
 
+ out:
 	dev_kfree_skb(skb);
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     			if (ieee80211_prepare_and_rx_handle(&rx, skb, true))
     				return;
+    			goto out;
     		}
     	}
@@ Expand Down Expand Up @@
     			return;
     	}
+     out:
     	dev_kfree_skb(skb);
     }
@@ Expand Down @@