Commit 2b8837ae authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

net: 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 f0e78826

net/core/dev.c

+5 −5
Original line number Diff line number Diff line
@@ -3495,11 +3495,11 @@ EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister); 
static bool skb_pfmemalloc_protocol(struct sk_buff *skb)

{

	switch (skb->protocol) {

	case __constant_htons(ETH_P_ARP):

	case __constant_htons(ETH_P_IP):

	case __constant_htons(ETH_P_IPV6):

	case __constant_htons(ETH_P_8021Q):

	case __constant_htons(ETH_P_8021AD):

	case htons(ETH_P_ARP):

	case htons(ETH_P_IP):

	case htons(ETH_P_IPV6):

	case htons(ETH_P_8021Q):

	case htons(ETH_P_8021AD):

		return true;

	default:

		return false;

net/core/flow_dissector.c

+7 −7
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow) 


again:

	switch (proto) {

	case __constant_htons(ETH_P_IP): {

	case htons(ETH_P_IP): {

		const struct iphdr *iph;

		struct iphdr _iph;

ip:
@@ -77,7 +77,7 @@ bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow) 
		iph_to_flow_copy_addrs(flow, iph);

		break;

	}

	case __constant_htons(ETH_P_IPV6): {

	case htons(ETH_P_IPV6): {

		const struct ipv6hdr *iph;

		struct ipv6hdr _iph;

ipv6:
@@ -91,8 +91,8 @@ bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow) 
		nhoff += sizeof(struct ipv6hdr);

		break;

	}

	case __constant_htons(ETH_P_8021AD):

	case __constant_htons(ETH_P_8021Q): {

	case htons(ETH_P_8021AD):

	case htons(ETH_P_8021Q): {

		const struct vlan_hdr *vlan;

		struct vlan_hdr _vlan;
@@ -104,7 +104,7 @@ bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow) 
		nhoff += sizeof(*vlan);

		goto again;

	}

	case __constant_htons(ETH_P_PPP_SES): {

	case htons(ETH_P_PPP_SES): {

		struct {

			struct pppoe_hdr hdr;

			__be16 proto;
@@ -115,9 +115,9 @@ bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow) 
		proto = hdr->proto;

		nhoff += PPPOE_SES_HLEN;

		switch (proto) {

		case __constant_htons(PPP_IP):

		case htons(PPP_IP):

			goto ip;

		case __constant_htons(PPP_IPV6):

		case htons(PPP_IPV6):

			goto ipv6;

		default:

			return false;