git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
net
/
ipv6
/
exthdrs.c
diff --git
a/net/ipv6/exthdrs.c
b/net/ipv6/exthdrs.c
index
9ca783d
..
af78fe8
100644
(file)
--- a/
net/ipv6/exthdrs.c
+++ b/
net/ipv6/exthdrs.c
@@
-485,7
+485,7
@@
static struct tlvtype_proc tlvprochopopt_lst[] = {
{ -1, }
};
{ -1, }
};
-int ipv6_parse_hopopts(struct sk_buff *skb)
+int ipv6_parse_hopopts(struct sk_buff *skb
, int nhoff
)
{
struct inet6_skb_parm *opt = IP6CB(skb);
{
struct inet6_skb_parm *opt = IP6CB(skb);
@@
-505,7
+505,7
@@
int ipv6_parse_hopopts(struct sk_buff *skb)
if (ip6_parse_tlv(tlvprochopopt_lst, skb)) {
skb->h.raw += (skb->h.raw[1]+1)<<3;
opt->nhoff = sizeof(struct ipv6hdr);
if (ip6_parse_tlv(tlvprochopopt_lst, skb)) {
skb->h.raw += (skb->h.raw[1]+1)<<3;
opt->nhoff = sizeof(struct ipv6hdr);
- return
1
;
+ return
sizeof(struct ipv6hdr)
;
}
return -1;
}
}
return -1;
}