Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 237473
b: refs/heads/master
c: a5f5e36
h: refs/heads/master
i:
  237471: e511049
v: v3
  • Loading branch information
Hagen Paul Pfeifer authored and David S. Miller committed Feb 25, 2011
1 parent d79cc99 commit bd0a264
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3b193ade594e4f2d501d4c3a9f43d49176f03230
refs/heads/master: a5f5e3689c8682e06ba155676d69ccf3f4172cb4
3 changes: 0 additions & 3 deletions trunk/net/ipv6/ip6_output.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit bd0a264

Please sign in to comment.