Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0e78826 authored Mar 12, 2014 by Joe Perches Committed by David S. Miller Mar 12, 2014

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>

parent b338ce27

net/8021q/vlan.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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();

net/8021q/vlan_netlink.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;