From 13b83ab6671894bfc9031953c9a71561877f7144 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil.sutter@viprinet.com>
Date: Fri, 1 Feb 2013 07:21:41 +0000
Subject: [PATCH] --- yaml --- r: 349656 b: refs/heads/master c:
 9665d5d62487e8e7b1f546c00e11107155384b9a h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/net/packet/af_packet.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 00afd8213117..bbb370f05560 100644
--- 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
index e639645e8fec..c111bd0e083a 100644
--- 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);