netdev - [PATCH net-next 15/27] ipv4/tunnel: use __vlan

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <6426e1ea2c06e834e07ddd1867c18c65fd623566.1481586602.git.mirq-linux@rere.qmqm.pl>
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:     "David S. Miller" <davem@...emloft.net> (maintainer:NETWORKING
        [IPv4/IPv6]),
        Alexey Kuznetsov <kuznet@....inr.ac.ru> (maintainer:NETWORKING
        [IPv4/IPv6]),
        James Morris <jmorris@...ei.org> (maintainer:NETWORKING [IPv4/IPv6]),
        Hideaki YOSHIFUJI <yoshfuji@...ux-ipv6.org> (maintainer:NETWORKING
        [IPv4/IPv6]),
        Patrick McHardy <kaber@...sh.net> (maintainer:NETWORKING
        [IPv4/IPv6])
Subject: [PATCH net-next 15/27] ipv4/tunnel: use __vlan_hwaccel helpers

Signed-off-by: Michał Mirosław <mirq-linux@...e.qmqm.pl>
---
 net/ipv4/ip_tunnel_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index fed3d29..0004a54 100644
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -120,7 +120,7 @@ int __iptunnel_pull_header(struct sk_buff *skb, int hdr_len,
 	}
 
 	skb_clear_hash_if_not_l4(skb);
-	skb->vlan_tci = 0;
+	__vlan_hwaccel_clear_tag(skb);
 	skb_set_queue_mapping(skb, 0);
 	skb_scrub_packet(skb, xnet);
 
-- 
2.10.2