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]
/
net
/
ipv6
/
ip6_output.c
diff --git
a/net/ipv6/ip6_output.c
b/net/ipv6/ip6_output.c
index
3284d61
..
40e7581
100644
(file)
--- a/
net/ipv6/ip6_output.c
+++ b/
net/ipv6/ip6_output.c
@@
-132,7
+132,7
@@
static int ip6_finish_output(struct sk_buff *skb)
return ip6_finish_output2(skb);
}
-int ip6_output(struct sk_buff *skb)
+int ip6_output(struct s
ock *sk, struct s
k_buff *skb)
{
struct net_device *dev = skb_dst(skb)->dev;
struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));