mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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:
Joe Perches 2014-03-12 10:04:15 -07:00 committed by David S. Miller
parent b338ce270e
commit f0e78826e4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/8021q/vlan.h
View File

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

4
net/8021q/vlan_netlink.c
View File

@ -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;