From 8a5d2bc4b4dd02124c6b6af0a8868fb2f7573904 Mon Sep 17 00:00:00 2001
From: Mark Ryden <markryde@gmail.com>
Date: Wed, 19 Dec 2007 23:38:11 -0800
Subject: [PATCH] --- yaml --- r: 75128 b: refs/heads/master c:
 e0260feddf8a68301c75cdfff9ec251d5851b006 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 270735fbbfb0..14039294f62d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 286e310f94b9459f3fa975333781c969b1041522
+refs/heads/master: e0260feddf8a68301c75cdfff9ec251d5851b006
diff --git a/trunk/net/ipv4/arp.c b/trunk/net/ipv4/arp.c
index b3f366a33a5c..08174a2aa878 100644
--- a/trunk/net/ipv4/arp.c
+++ b/trunk/net/ipv4/arp.c
@@ -706,7 +706,7 @@ static int arp_process(struct sk_buff *skb)
 	struct arphdr *arp;
 	unsigned char *arp_ptr;
 	struct rtable *rt;
-	unsigned char *sha, *tha;
+	unsigned char *sha;
 	__be32 sip, tip;
 	u16 dev_type = dev->type;
 	int addr_type;
@@ -771,7 +771,6 @@ static int arp_process(struct sk_buff *skb)
 	arp_ptr += dev->addr_len;
 	memcpy(&sip, arp_ptr, 4);
 	arp_ptr += 4;
-	tha	= arp_ptr;
 	arp_ptr += dev->addr_len;
 	memcpy(&tip, arp_ptr, 4);
 /*