aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/nfnetlink_log.c
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2016-02-18 15:03:27 +0100
committerDavid S. Miller <davem@davemloft.net>2016-02-18 11:42:19 -0500
commit905f0a739ad82c6371fb0cb0e71db14a750702ad (patch)
tree598583bc99bea92b280d0487c6ce910ece519a99 /net/netfilter/nfnetlink_log.c
parentRevert "genl: Add genlmsg_new_unicast() for unicast message allocation" (diff)
downloadlinux-dev-905f0a739ad82c6371fb0cb0e71db14a750702ad.tar.xz
linux-dev-905f0a739ad82c6371fb0cb0e71db14a750702ad.zip
nfnetlink: remove nfnetlink_alloc_skb
Following mmapped netlink removal this code can be simplified by removing the alloc wrapper. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nfnetlink_log.c')
-rw-r--r--net/netfilter/nfnetlink_log.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 8ca932057c13..11f81c8385fc 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -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);
}
}