From 9b2ae434eb5611fa6a0923d376b6d6f6dab74bee Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Wed, 26 Sep 2012 01:39:20 +0000
Subject: [PATCH] --- yaml --- r: 328118 b: refs/heads/master c:
 bcc452935da124f26885e969ec5a78a8735d1452 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 76693e5af23a..91b796fc83d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2bcabec6ea5ba30dd2097dc1566e9957d14117c
+refs/heads/master: bcc452935da124f26885e969ec5a78a8735d1452
diff --git a/trunk/net/ipv6/ip6_gre.c b/trunk/net/ipv6/ip6_gre.c
index 613a16647741..0185679c5f53 100644
--- a/trunk/net/ipv6/ip6_gre.c
+++ b/trunk/net/ipv6/ip6_gre.c
@@ -1279,16 +1279,8 @@ static int ip6gre_header(struct sk_buff *skb, struct net_device *dev,
 	return -t->hlen;
 }
 
-static int ip6gre_header_parse(const struct sk_buff *skb, unsigned char *haddr)
-{
-	const struct ipv6hdr *ipv6h = (const struct ipv6hdr *)skb_mac_header(skb);
-	memcpy(haddr, &ipv6h->saddr, sizeof(struct in6_addr));
-	return sizeof(struct in6_addr);
-}
-
 static const struct header_ops ip6gre_header_ops = {
 	.create	= ip6gre_header,
-	.parse	= ip6gre_header_parse,
 };
 
 static const struct net_device_ops ip6gre_netdev_ops = {