Commit f0e78826 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b338ce27
...@@ -38,9 +38,9 @@ struct vlan_info { ...@@ -38,9 +38,9 @@ struct vlan_info {
static inline unsigned int vlan_proto_idx(__be16 proto) static inline unsigned int vlan_proto_idx(__be16 proto)
{ {
switch (proto) { switch (proto) {
case __constant_htons(ETH_P_8021Q): case htons(ETH_P_8021Q):
return VLAN_PROTO_8021Q; return VLAN_PROTO_8021Q;
case __constant_htons(ETH_P_8021AD): case htons(ETH_P_8021AD):
return VLAN_PROTO_8021AD; return VLAN_PROTO_8021AD;
default: default:
BUG(); BUG();
......
...@@ -56,8 +56,8 @@ static int vlan_validate(struct nlattr *tb[], struct nlattr *data[]) ...@@ -56,8 +56,8 @@ static int vlan_validate(struct nlattr *tb[], struct nlattr *data[])
if (data[IFLA_VLAN_PROTOCOL]) { if (data[IFLA_VLAN_PROTOCOL]) {
switch (nla_get_be16(data[IFLA_VLAN_PROTOCOL])) { switch (nla_get_be16(data[IFLA_VLAN_PROTOCOL])) {
case __constant_htons(ETH_P_8021Q): case htons(ETH_P_8021Q):
case __constant_htons(ETH_P_8021AD): case htons(ETH_P_8021AD):
break; break;
default: default:
return -EPROTONOSUPPORT; return -EPROTONOSUPPORT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment