summaryrefslogtreecommitdiffstats
path: root/net/bridge/br_private.h
diff options
context:
space:
mode:
authorMichał Mirosław <mirq-linux@rere.qmqm.pl>2018-11-09 00:18:03 +0100
committerDavid S. Miller <davem@davemloft.net>2018-11-08 20:45:04 -0800
commit5978f8a9fb492a74765822a545f16eb879fab937 (patch)
treef9925556bf4571f5e85b3d489a4a466d40c44532 /net/bridge/br_private.h
parent418a976d6c68d0835ffebf755cdbd53e9b9c6e7f (diff)
downloadlinux-5978f8a9fb492a74765822a545f16eb879fab937.tar.gz
linux-5978f8a9fb492a74765822a545f16eb879fab937.tar.bz2
linux-5978f8a9fb492a74765822a545f16eb879fab937.zip
bridge: use __vlan_hwaccel helpers
This removes assumption than vlan_tci != 0 when tag is present. Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_private.h')
-rw-r--r--net/bridge/br_private.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 2920e06a5403..67105c66584a 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -905,7 +905,7 @@ static inline int br_vlan_get_tag(const struct sk_buff *skb, u16 *vid)
int err = 0;
if (skb_vlan_tag_present(skb)) {
- *vid = skb_vlan_tag_get(skb) & VLAN_VID_MASK;
+ *vid = skb_vlan_tag_get_id(skb);
} else {
*vid = 0;
err = -EINVAL;