git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
net
/
ipv6
/
ip6_input.c
diff --git
a/net/ipv6/ip6_input.c
b/net/ipv6/ip6_input.c
index
25c2a9e
..
6b8e6d7
100644
(file)
--- a/
net/ipv6/ip6_input.c
+++ b/
net/ipv6/ip6_input.c
@@
-111,7
+111,7
@@
int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt
}
if (hdr->nexthdr == NEXTHDR_HOP) {
- if (ipv6_parse_hopopts(skb) < 0) {
+ if (ipv6_parse_hopopts(
&
skb) < 0) {
IP6_INC_STATS_BH(IPSTATS_MIB_INHDRERRORS);
return 0;
}