Merge branch 'master' of ../netdev/

2011-09-16 01:09:02 -04:00
parent 7756332f5b e2faeec2de
commit 52b9aca7ae
241 changed files with 1881 additions and 1133 deletions
@@ -39,6 +39,7 @@ extern int			datagram_recv_ctl(struct sock *sk,
 						  struct sk_buff *skb);

 extern int			datagram_send_ctl(struct net *net,
+						  struct sock *sk,
 						  struct msghdr *msg,
 						  struct flowi6 *fl6,
 						  struct ipv6_txoptions *opt,