mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-04-01 12:04:08 +00:00
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>
This commit is contained in:
parent
b338ce270e
commit
f0e78826e4
2 changed files with 4 additions and 4 deletions
|
@ -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[])
|
||||||
|
|
||||||
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;
|
||||||
|
|
Loading…
Add table
Reference in a new issue