Commit 549017aa authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

netlink: remove netlink_broadcast_filtered 



No users in tree since commit a3498436 ("netns: restrict uevents"),
so remove this functionality.

Cc: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 95bf387e

include/linux/netlink.h

+0 −4
Original line number Diff line number Diff line
@@ -156,10 +156,6 @@ bool netlink_strict_get_check(struct sk_buff *skb); 
int netlink_unicast(struct sock *ssk, struct sk_buff *skb, __u32 portid, int nonblock);

int netlink_broadcast(struct sock *ssk, struct sk_buff *skb, __u32 portid,

		      __u32 group, gfp_t allocation);

int netlink_broadcast_filtered(struct sock *ssk, struct sk_buff *skb,

			       __u32 portid, __u32 group, gfp_t allocation,

			       int (*filter)(struct sock *dsk, struct sk_buff *skb, void *data),

			       void *filter_data);

int netlink_set_err(struct sock *ssk, __u32 portid, __u32 group, int code);

int netlink_register_notifier(struct notifier_block *nb);

int netlink_unregister_notifier(struct notifier_block *nb);

net/netlink/af_netlink.c

+2 −21
Original line number Diff line number Diff line
@@ -1407,8 +1407,6 @@ struct netlink_broadcast_data { 
	int delivered;

	gfp_t allocation;

	struct sk_buff *skb, *skb2;

	int (*tx_filter)(struct sock *dsk, struct sk_buff *skb, void *data);

	void *tx_data;

};



static void do_one_broadcast(struct sock *sk,
@@ -1462,11 +1460,6 @@ static void do_one_broadcast(struct sock *sk, 
			p->delivery_failure = 1;

		goto out;

	}

	if (p->tx_filter && p->tx_filter(sk, p->skb2, p->tx_data)) {

		kfree_skb(p->skb2);

		p->skb2 = NULL;

		goto out;

	}

	if (sk_filter(sk, p->skb2)) {

		kfree_skb(p->skb2);

		p->skb2 = NULL;
@@ -1489,10 +1482,8 @@ static void do_one_broadcast(struct sock *sk, 
	sock_put(sk);

}



int netlink_broadcast_filtered(struct sock *ssk, struct sk_buff *skb, u32 portid,

	u32 group, gfp_t allocation,

	int (*filter)(struct sock *dsk, struct sk_buff *skb, void *data),

	void *filter_data)

int netlink_broadcast(struct sock *ssk, struct sk_buff *skb, u32 portid,

		      u32 group, gfp_t allocation)

{

	struct net *net = sock_net(ssk);

	struct netlink_broadcast_data info;
@@ -1511,8 +1502,6 @@ int netlink_broadcast_filtered(struct sock *ssk, struct sk_buff *skb, u32 portid 
	info.allocation = allocation;

	info.skb = skb;

	info.skb2 = NULL;

	info.tx_filter = filter;

	info.tx_data = filter_data;



	/* While we sleep in clone, do not allow to change socket list */
@@ -1538,14 +1527,6 @@ int netlink_broadcast_filtered(struct sock *ssk, struct sk_buff *skb, u32 portid 
	}

	return -ESRCH;

}

EXPORT_SYMBOL(netlink_broadcast_filtered);



int netlink_broadcast(struct sock *ssk, struct sk_buff *skb, u32 portid,

		      u32 group, gfp_t allocation)

{

	return netlink_broadcast_filtered(ssk, skb, portid, group, allocation,

		NULL, NULL);

}

EXPORT_SYMBOL(netlink_broadcast);



struct netlink_set_err_data {