aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/netlink.h2
-rw-r--r--ipc/mqueue.c5
-rw-r--r--net/netlink/af_netlink.c4
3 files changed, 5 insertions, 6 deletions
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index e638256ce472..7b552b6c2c19 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -194,7 +194,7 @@ struct sock *netlink_getsockbyfilp(struct file *filp);
194int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock, 194int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock,
195 long timeo, struct sock *ssk); 195 long timeo, struct sock *ssk);
196void netlink_detachskb(struct sock *sk, struct sk_buff *skb); 196void netlink_detachskb(struct sock *sk, struct sk_buff *skb);
197int netlink_sendskb(struct sock *sk, struct sk_buff *skb, int protocol); 197int netlink_sendskb(struct sock *sk, struct sk_buff *skb);
198 198
199/* 199/*
200 * skb should fit one page. This choice is good for headerless malloc. 200 * skb should fit one page. This choice is good for headerless malloc.
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 145d5a0d299f..24df3347ad4b 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -521,8 +521,7 @@ static void __do_notify(struct mqueue_inode_info *info)
521 break; 521 break;
522 case SIGEV_THREAD: 522 case SIGEV_THREAD:
523 set_cookie(info->notify_cookie, NOTIFY_WOKENUP); 523 set_cookie(info->notify_cookie, NOTIFY_WOKENUP);
524 netlink_sendskb(info->notify_sock, 524 netlink_sendskb(info->notify_sock, info->notify_cookie);
525 info->notify_cookie, 0);
526 break; 525 break;
527 } 526 }
528 /* after notification unregisters process */ 527 /* after notification unregisters process */
@@ -568,7 +567,7 @@ static void remove_notification(struct mqueue_inode_info *info)
568 if (info->notify_owner != NULL && 567 if (info->notify_owner != NULL &&
569 info->notify.sigev_notify == SIGEV_THREAD) { 568 info->notify.sigev_notify == SIGEV_THREAD) {
570 set_cookie(info->notify_cookie, NOTIFY_REMOVED); 569 set_cookie(info->notify_cookie, NOTIFY_REMOVED);
571 netlink_sendskb(info->notify_sock, info->notify_cookie, 0); 570 netlink_sendskb(info->notify_sock, info->notify_cookie);
572 } 571 }
573 put_pid(info->notify_owner); 572 put_pid(info->notify_owner);
574 info->notify_owner = NULL; 573 info->notify_owner = NULL;
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index f934f54fbfd5..a5bd63ca86bc 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -791,7 +791,7 @@ int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock,
791 return 0; 791 return 0;
792} 792}
793 793
794int netlink_sendskb(struct sock *sk, struct sk_buff *skb, int protocol) 794int netlink_sendskb(struct sock *sk, struct sk_buff *skb)
795{ 795{
796 int len = skb->len; 796 int len = skb->len;
797 797
@@ -853,7 +853,7 @@ retry:
853 if (err) 853 if (err)
854 return err; 854 return err;
855 855
856 return netlink_sendskb(sk, skb, ssk->sk_protocol); 856 return netlink_sendskb(sk, skb);
857} 857}
858 858
859int netlink_has_listeners(struct sock *sk, unsigned int group) 859int netlink_has_listeners(struct sock *sk, unsigned int group)