Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[firefly-linux-kernel-4.4.55.git] / net / 8021q / vlan.h

diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h
index 5704ed9c3a23bb13d1d5b41f36d6575fd3ec3ed9..9d010a09ab9880a6eb15cee0524b46be53d76587 100644 (file)
--- a/net/8021q/vlan.h
+++ b/net/8021q/vlan.h
@@ -38,9 +38,9 @@ struct vlan_info {
 static inline unsigned int vlan_proto_idx(__be16 proto)
 {
        switch (proto) {
-       case __constant_htons(ETH_P_8021Q):
+       case htons(ETH_P_8021Q):
                return VLAN_PROTO_8021Q;
-       case __constant_htons(ETH_P_8021AD):
+       case htons(ETH_P_8021AD):
                return VLAN_PROTO_8021AD;
        default:
                BUG();