]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
nfnetlink/queue: use __vlan_hwaccel helpers
authorMichał Mirosław <mirq-linux@rere.qmqm.pl>
Thu, 8 Nov 2018 23:18:02 +0000 (00:18 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 9 Nov 2018 04:45:04 +0000 (20:45 -0800)
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/nfnetlink_queue.c

index 43041f087eb341206d8e6439777a05d0c1dbeb86..1ce30efe6854a77375cfbe8ff2e9775863ab6223 100644 (file)
@@ -1148,8 +1148,9 @@ static int nfqa_parse_bridge(struct nf_queue_entry *entry,
                if (!tb[NFQA_VLAN_TCI] || !tb[NFQA_VLAN_PROTO])
                        return -EINVAL;
 
-               entry->skb->vlan_tci = ntohs(nla_get_be16(tb[NFQA_VLAN_TCI]));
-               entry->skb->vlan_proto = nla_get_be16(tb[NFQA_VLAN_PROTO]);
+               __vlan_hwaccel_put_tag(entry->skb,
+                       nla_get_be16(tb[NFQA_VLAN_PROTO]),
+                       ntohs(nla_get_be16(tb[NFQA_VLAN_TCI])));
        }
 
        if (nfqa[NFQA_L2HDR]) {