diff options
author | Florian Westphal <fw@strlen.de> | 2016-02-18 15:03:28 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-02-18 11:42:22 -0500 |
commit | c5b0db3263b92526bc0c1b6380c0c99f91f069fc (patch) | |
tree | b3a306ae943dab972f6acd6d311b4b3a21a3efaa /net/netfilter/nfnetlink_queue.c | |
parent | 905f0a739ad82c6371fb0cb0e71db14a750702ad (diff) | |
download | linux-stable-c5b0db3263b92526bc0c1b6380c0c99f91f069fc.tar.gz linux-stable-c5b0db3263b92526bc0c1b6380c0c99f91f069fc.tar.bz2 linux-stable-c5b0db3263b92526bc0c1b6380c0c99f91f069fc.zip |
nfnetlink: Revert "nfnetlink: add support for memory mapped netlink"
reverts commit 3ab1f683bf8b ("nfnetlink: add support for memory mapped
netlink")'
Like previous commits in the series, remove wrappers that are not needed
after mmapped netlink removal.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nfnetlink_queue.c')
-rw-r--r-- | net/netfilter/nfnetlink_queue.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index 1d3936587ace..75429997ed41 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -301,7 +301,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, __be32 **packet_id_ptr) { size_t size; - size_t data_len = 0, cap_len = 0, rem_len = 0; + size_t data_len = 0, cap_len = 0; unsigned int hlen = 0; struct sk_buff *skb; struct nlattr *nla; @@ -361,7 +361,6 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, hlen = min_t(unsigned int, hlen, data_len); size += sizeof(struct nlattr) + hlen; cap_len = entskb->len; - rem_len = data_len - hlen; break; } @@ -386,8 +385,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, size += nla_total_size(seclen); } - skb = __netlink_alloc_skb(net->nfnl, size, rem_len, queue->peer_portid, - GFP_ATOMIC); + skb = alloc_skb(size, GFP_ATOMIC); if (!skb) { skb_tx_error(entskb); return NULL; |