Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9457afee authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

netlink: Remove nonblock parameter from netlink_attachskb 



Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 40aecb1b

include/linux/netlink.h

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ extern int netlink_unregister_notifier(struct notifier_block *nb); 


/* finegrained unicast helpers: */

struct sock *netlink_getsockbyfilp(struct file *filp);

int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock,

int netlink_attachskb(struct sock *sk, struct sk_buff *skb,

		      long *timeo, struct sock *ssk);

void netlink_detachskb(struct sock *sk, struct sk_buff *skb);

int netlink_sendskb(struct sock *sk, struct sk_buff *skb);

ipc/mqueue.c

+1 −1
Original line number Diff line number Diff line
@@ -1054,7 +1054,7 @@ asmlinkage long sys_mq_notify(mqd_t mqdes, 
			}



			timeo = MAX_SCHEDULE_TIMEOUT;

			ret = netlink_attachskb(sock, nc, 0, &timeo, NULL);

			ret = netlink_attachskb(sock, nc, &timeo, NULL);

			if (ret == 1)

		       		goto retry;

			if (ret) {

net/netlink/af_netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ struct sock *netlink_getsockbyfilp(struct file *filp) 
 * 0: continue

 * 1: repeat lookup - reference dropped while waiting for socket memory.

 */

int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock,

int netlink_attachskb(struct sock *sk, struct sk_buff *skb,

		      long *timeo, struct sock *ssk)

{

	struct netlink_sock *nlk;
@@ -892,7 +892,7 @@ int netlink_unicast(struct sock *ssk, struct sk_buff *skb, 
		return err;

	}



	err = netlink_attachskb(sk, skb, nonblock, &timeo, ssk);

	err = netlink_attachskb(sk, skb, &timeo, ssk);

	if (err == 1)

		goto retry;

	if (err)