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 tag 'qcom-soc-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
include
/
net
/
ipv6.h
diff --git
a/include/net/ipv6.h
b/include/net/ipv6.h
index
4f541f1
..
d640925
100644
(file)
--- a/
include/net/ipv6.h
+++ b/
include/net/ipv6.h
@@
-731,7
+731,7
@@
struct dst_entry *ip6_blackhole_route(struct net *net,
* skb processing functions
*/
-int ip6_output(struct sk_buff *skb);
+int ip6_output(struct s
ock *sk, struct s
k_buff *skb);
int ip6_forward(struct sk_buff *skb);
int ip6_input(struct sk_buff *skb);
int ip6_mc_input(struct sk_buff *skb);