From 02ea5b75a3faa2008d00c52e317e6d2080a7b753 Mon Sep 17 00:00:00 2001
From: Jiri Olsa <olsajiri@gmail.com>
Date: Sun, 23 Mar 2008 22:42:34 -0700
Subject: [PATCH] --- yaml --- r: 90253 b: refs/heads/master c:
 2a706ec1881709b8a90d8ccdd1fde40b3cc79364 h: refs/heads/master i:   90251:
 c0a2834d6b3cc5a0a3ca288d40caf1c024b68f55 v: v3

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

diff --git a/[refs] b/[refs]
index fb6725ceb623..2070a45fdfa9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2051f11fb86b0056fec440fe7e9fa8370d60a5c6
+refs/heads/master: 2a706ec1881709b8a90d8ccdd1fde40b3cc79364
diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c
index b8b827c7062d..a56ed2120e07 100644
--- a/trunk/net/packet/af_packet.c
+++ b/trunk/net/packet/af_packet.c
@@ -1658,7 +1658,7 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing
 	int err = 0;
 
 	if (req->tp_block_nr) {
-		int i, l;
+		int i;
 
 		/* Sanity tests and some calculations */
 
@@ -1687,7 +1687,6 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing
 		if (unlikely(!pg_vec))
 			goto out;
 
-		l = 0;
 		for (i = 0; i < req->tp_block_nr; i++) {
 			char *ptr = pg_vec[i];
 			struct tpacket_hdr *header;