---

yaml --- r: 349656 b: refs/heads/master c: 9665d5d h: refs/heads/master v: v3
git-mirror · Feb 3, 2013 · 13b83ab · 13b83ab
1 parent e5252dc
commit 13b83ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92df9b217ee2392024483ba5b85a88d92d60f3c1
+refs/heads/master: 9665d5d62487e8e7b1f546c00e11107155384b9a
diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c
@@ -2361,13 +2361,15 @@ static int packet_release(struct socket *sock)
 
 	packet_flush_mclist(sk);
 
-	memset(&req_u, 0, sizeof(req_u));
-
-	if (po->rx_ring.pg_vec)
+	if (po->rx_ring.pg_vec) {
+		memset(&req_u, 0, sizeof(req_u));
 		packet_set_ring(sk, &req_u, 1, 0);
+	}
 
-	if (po->tx_ring.pg_vec)
+	if (po->tx_ring.pg_vec) {
+		memset(&req_u, 0, sizeof(req_u));
 		packet_set_ring(sk, &req_u, 1, 1);
+	}
 
 	fanout_release(sk);