From f5448de4938ff3fc4c1b8258b6ef80ce2ec0b114 Mon Sep 17 00:00:00 2001
From: Micah Gruber <micah.gruber@gmail.com>
Date: Wed, 5 Sep 2007 07:56:50 -0700
Subject: [PATCH] --- yaml --- r: 66370 b: refs/heads/master c:
 1dfcae776548f464bee793d06484be275ba8efe7 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/ipv6/ipcomp6.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ad1d0c8a50e9..7287e0879741 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9ee23dfac61a713de48b20999dcacb7ef3c5ed0
+refs/heads/master: 1dfcae776548f464bee793d06484be275ba8efe7
diff --git a/trunk/net/ipv6/ipcomp6.c b/trunk/net/ipv6/ipcomp6.c
index 473f165310ea..91b2a75b7d09 100644
--- a/trunk/net/ipv6/ipcomp6.c
+++ b/trunk/net/ipv6/ipcomp6.c
@@ -65,7 +65,6 @@ static LIST_HEAD(ipcomp6_tfms_list);
 static int ipcomp6_input(struct xfrm_state *x, struct sk_buff *skb)
 {
 	int err = -ENOMEM;
-	struct ipv6hdr *iph;
 	struct ipv6_comp_hdr *ipch;
 	int plen, dlen;
 	struct ipcomp_data *ipcd = x->data;
@@ -79,7 +78,6 @@ static int ipcomp6_input(struct xfrm_state *x, struct sk_buff *skb)
 	skb->ip_summed = CHECKSUM_NONE;
 
 	/* Remove ipcomp header and decompress original payload */
-	iph = ipv6_hdr(skb);
 	ipch = (void *)skb->data;
 	skb->transport_header = skb->network_header + sizeof(*ipch);
 	__skb_pull(skb, sizeof(*ipch));