From bd0a26421b8bd5d36e1da96fcad6b0a81b970758 Mon Sep 17 00:00:00 2001 From: Hagen Paul Pfeifer Date: Fri, 25 Feb 2011 05:45:17 +0000 Subject: [PATCH] --- yaml --- r: 237473 b: refs/heads/master c: a5f5e3689c8682e06ba155676d69ccf3f4172cb4 h: refs/heads/master i: 237471: e511049fef9481238ad4063cf6e2e98d7d59f7e0 v: v3 --- [refs] | 2 +- trunk/net/ipv6/ip6_output.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 449d43709394..7ac8b3c4d939 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b193ade594e4f2d501d4c3a9f43d49176f03230 +refs/heads/master: a5f5e3689c8682e06ba155676d69ccf3f4172cb4 diff --git a/trunk/net/ipv6/ip6_output.c b/trunk/net/ipv6/ip6_output.c index 2600e2288724..25a2647f9942 100644 --- a/trunk/net/ipv6/ip6_output.c +++ b/trunk/net/ipv6/ip6_output.c @@ -274,13 +274,10 @@ int ip6_nd_hdr(struct sock *sk, struct sk_buff *skb, struct net_device *dev, { struct ipv6_pinfo *np = inet6_sk(sk); struct ipv6hdr *hdr; - int totlen; skb->protocol = htons(ETH_P_IPV6); skb->dev = dev; - totlen = len + sizeof(struct ipv6hdr); - skb_reset_network_header(skb); skb_put(skb, sizeof(struct ipv6hdr)); hdr = ipv6_hdr(skb);