diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:02:34 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:02:34 +0800 |
| commit | a40f2a595adfe0be6ced06fdb4c4a24ae3291a91 (patch) | |
| tree | 4e99ec8bd3ce134bdbafd54a0fc873f11c33e21b /net/netfilter/nfnetlink_queue.c | |
| parent | 293c379504006b5ea8b4e7109ba4ebc3211f9b91 (diff) | |
| parent | 49fe90b853dfb1087d0a734cd7f4af1aa00c8e53 (diff) | |
Merge tag 'v4.4.114' into linux-linaro-lsk-v4.4lsk-v4.4-18.02
This is the 4.4.114 stable release
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 f6837f9b6d6c..c14d2e8eaec3 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -1053,10 +1053,8 @@ nfqnl_recv_verdict(struct sock *ctnl, struct sk_buff *skb, struct net *net = sock_net(ctnl); struct nfnl_queue_net *q = nfnl_queue_pernet(net); - queue = instance_lookup(q, queue_num); - if (!queue) - queue = verdict_instance_lookup(q, queue_num, - NETLINK_CB(skb).portid); + queue = verdict_instance_lookup(q, queue_num, + NETLINK_CB(skb).portid); if (IS_ERR(queue)) return PTR_ERR(queue); |