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

Commit 905f0a73 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

nfnetlink: remove nfnetlink_alloc_skb 



Following mmapped netlink removal this code can be simplified by
removing the alloc wrapper.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 263ea090

include/linux/netfilter/nfnetlink.h

+0 −2
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n); 
int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n);



int nfnetlink_has_listeners(struct net *net, unsigned int group);

struct sk_buff *nfnetlink_alloc_skb(struct net *net, unsigned int size,

				    u32 dst_portid, gfp_t gfp_mask);

int nfnetlink_send(struct sk_buff *skb, struct net *net, u32 portid,

		   unsigned int group, int echo, gfp_t flags);

int nfnetlink_set_err(struct net *net, u32 portid, u32 group, int error);

net/netfilter/nfnetlink.c

+0 −7
Original line number Diff line number Diff line
@@ -127,13 +127,6 @@ int nfnetlink_has_listeners(struct net *net, unsigned int group) 
}

EXPORT_SYMBOL_GPL(nfnetlink_has_listeners);



struct sk_buff *nfnetlink_alloc_skb(struct net *net, unsigned int size,

				    u32 dst_portid, gfp_t gfp_mask)

{

	return netlink_alloc_skb(net->nfnl, size, dst_portid, gfp_mask);

}

EXPORT_SYMBOL_GPL(nfnetlink_alloc_skb);



int nfnetlink_send(struct sk_buff *skb, struct net *net, u32 portid,

		   unsigned int group, int echo, gfp_t flags)

{

net/netfilter/nfnetlink_log.c

+2 −3
Original line number Diff line number Diff line
@@ -330,14 +330,13 @@ nfulnl_alloc_skb(struct net *net, u32 peer_portid, unsigned int inst_size, 
	 * message.  WARNING: has to be <= 128k due to slab restrictions */



	n = max(inst_size, pkt_size);

	skb = nfnetlink_alloc_skb(net, n, peer_portid, GFP_ATOMIC);

	skb = alloc_skb(n, GFP_ATOMIC);

	if (!skb) {

		if (n > pkt_size) {

			/* try to allocate only as much as we need for current

			 * packet */



			skb = nfnetlink_alloc_skb(net, pkt_size,

						  peer_portid, GFP_ATOMIC);

			skb = alloc_skb(pkt_size, GFP_ATOMIC);

		}

	}