8021q: Convert uses of __constant_<foo> to <foo>

The use of __constant_<foo> has been unnecessary for quite awhile now.

Make these uses consistent with the rest of the kernel.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

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();

diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
index c7e634af85165613822074b28ceeca4af7153ae7..8ac8a5cc214331253e591fe26f6c3b39a00d5023 100644 (file)
--- a/net/8021q/vlan_netlink.c
+++ b/net/8021q/vlan_netlink.c
@@ -56,8 +56,8 @@ static int vlan_validate(struct nlattr *tb[], struct nlattr *data[])
 
        if (data[IFLA_VLAN_PROTOCOL]) {
                switch (nla_get_be16(data[IFLA_VLAN_PROTOCOL])) {
-               case __constant_htons(ETH_P_8021Q):
-               case __constant_htons(ETH_P_8021AD):
+               case htons(ETH_P_8021Q):
+               case htons(ETH_P_8021AD):
                        break;
                default:
                        return -EPROTONOSUPPORT;