leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: Convert uses of __constant_<foo> to <foo>

Browse Source 
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:17 -07:00
committed by David S. Miller
parent f0e78826e4
commit 2b8837aeaa
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/core/dev.c
View File

@@ -3495,11 +3495,11 @@ EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
static bool skb_pfmemalloc_protocol(struct sk_buff *skb) static bool skb_pfmemalloc_protocol(struct sk_buff *skb)
{ {
switch (skb->protocol) { switch (skb->protocol) {
case __constant_htons(ETH_P_ARP): case htons(ETH_P_ARP):
case __constant_htons(ETH_P_IP): case htons(ETH_P_IP):
case __constant_htons(ETH_P_IPV6): case htons(ETH_P_IPV6):
case __constant_htons(ETH_P_8021Q): case htons(ETH_P_8021Q):
case __constant_htons(ETH_P_8021AD): case htons(ETH_P_8021AD):
return true; return true;
default: default:
return false; return false;

14
net/core/flow_dissector.c
View File

@@ -61,7 +61,7 @@ bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow)
again: again:
switch (proto) { switch (proto) {
case __constant_htons(ETH_P_IP): { case htons(ETH_P_IP): {
const struct iphdr *iph; const struct iphdr *iph;
struct iphdr _iph; struct iphdr _iph;
ip: ip:
@@ -77,7 +77,7 @@ ip:
iph_to_flow_copy_addrs(flow, iph); iph_to_flow_copy_addrs(flow, iph);
break; break;
} }
case __constant_htons(ETH_P_IPV6): { case htons(ETH_P_IPV6): {
const struct ipv6hdr *iph; const struct ipv6hdr *iph;
struct ipv6hdr _iph; struct ipv6hdr _iph;
ipv6: ipv6:
@@ -91,8 +91,8 @@ ipv6:
nhoff += sizeof(struct ipv6hdr); nhoff += sizeof(struct ipv6hdr);
break; break;
} }
case __constant_htons(ETH_P_8021AD): case htons(ETH_P_8021AD):
case __constant_htons(ETH_P_8021Q): { case htons(ETH_P_8021Q): {
const struct vlan_hdr *vlan; const struct vlan_hdr *vlan;
struct vlan_hdr _vlan; struct vlan_hdr _vlan;
@@ -104,7 +104,7 @@ ipv6:
nhoff += sizeof(*vlan); nhoff += sizeof(*vlan);
goto again; goto again;
} }
case __constant_htons(ETH_P_PPP_SES): { case htons(ETH_P_PPP_SES): {
struct { struct {
struct pppoe_hdr hdr; struct pppoe_hdr hdr;
__be16 proto; __be16 proto;
@@ -115,9 +115,9 @@ ipv6:
proto = hdr->proto; proto = hdr->proto;
nhoff += PPPOE_SES_HLEN; nhoff += PPPOE_SES_HLEN;
switch (proto) { switch (proto) {
case __constant_htons(PPP_IP): case htons(PPP_IP):
goto ip; goto ip;
case __constant_htons(PPP_IPV6): case htons(PPP_IPV6):
goto ipv6; goto ipv6;
default: default:
return false; return false;