lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 13 Dec 2016 01:12:38 +0100 (CET) From: Michał Mirosław <mirq-linux@...e.qmqm.pl> To: netdev@...r.kernel.org Cc: Pablo Neira Ayuso <pablo@...filter.org> (supporter:NETFILTER ({IP ,IP6,ARP,EB,NF}TABLES)), Patrick McHardy <kaber@...sh.net> (supporter:NETFILTER ({IP,IP6,ARP ,EB,NF}TABLES)), Jozsef Kadlecsik <kadlec@...ckhole.kfki.hu> (supporter:NETFILTER ({IP,IP6,ARP,EB,NF}TABLES)), netfilter-devel@...r.kernel.org (open list:NETFILTER ({IP,IP6,ARP,EB ,NF}TABLES)) Subject: [PATCH net-next 16/27] nfnetlink/queue: use __vlan_hwaccel helpers Signed-off-by: Michał Mirosław <mirq-linux@...e.qmqm.pl> --- net/netfilter/nfnetlink_queue.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index be7627b..f268bb9 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -1111,8 +1111,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]) { -- 2.10.2
Powered by blists - more mailing lists