diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-11 17:51:46 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-11 17:51:46 -0500 |
| commit | cbefa3258eade263dbc9ae2c1f1ea2ca96e6b457 (patch) | |
| tree | 51f012ef93cc828be4eb693c0ced0503217d1025 /include/linux/netlink.h | |
| parent | 489ff4c7d167be954f715128790bd80d3c888322 (diff) | |
| parent | 25bf368b3d98668c5d5f38e2201d8bca16e52680 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/linux/netlink.h')
| -rw-r--r-- | include/linux/netlink.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 6a2ccf78a356..c256ebe2a7b4 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h | |||
| @@ -160,7 +160,8 @@ extern int netlink_unregister_notifier(struct notifier_block *nb); | |||
| 160 | 160 | ||
| 161 | /* finegrained unicast helpers: */ | 161 | /* finegrained unicast helpers: */ |
| 162 | struct sock *netlink_getsockbyfilp(struct file *filp); | 162 | struct sock *netlink_getsockbyfilp(struct file *filp); |
| 163 | int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock, long timeo); | 163 | int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock, |
| 164 | long timeo, struct sock *ssk); | ||
| 164 | void netlink_detachskb(struct sock *sk, struct sk_buff *skb); | 165 | void netlink_detachskb(struct sock *sk, struct sk_buff *skb); |
| 165 | int netlink_sendskb(struct sock *sk, struct sk_buff *skb, int protocol); | 166 | int netlink_sendskb(struct sock *sk, struct sk_buff *skb, int protocol); |
| 166 | 167 | ||