diff options
| author | David S. Miller <davem@davemloft.net> | 2011-09-16 01:09:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-16 01:09:02 -0400 |
| commit | 52b9aca7ae8726d1fb41b97dd1d243d107fef11b (patch) | |
| tree | 7acee111840bd25183513e9bde08e939ffd57be8 /include/net | |
| parent | 7756332f5b64c9c1535712b9679792e8bd4f0019 (diff) | |
| parent | e2faeec2de9e2c73958e6ea6065dde1e8cd6f3a2 (diff) | |
| download | linux-52b9aca7ae8726d1fb41b97dd1d243d107fef11b.tar.bz2 | |
Merge branch 'master' of ../netdev/
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/transp_v6.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h index 5271a741c3a3..498433dd067d 100644 --- a/include/net/transp_v6.h +++ b/include/net/transp_v6.h @@ -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, |