Skip to content

L
linux
Commit 60678040 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files
Options

net: Use hton[sl]() instead of __constant_hton[sl]() where applicable 

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a574420f
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 35 deletions
net/8021q/vlan_dev.c
View file @ 60678040
...@@ -48,7 +48,7 @@ static int vlan_dev_rebuild_header(struct sk_buff *skb) ...@@ -48,7 +48,7 @@ static int vlan_dev_rebuild_header(struct sk_buff *skb)
switch (veth->h_vlan_encapsulated_proto) { switch (veth->h_vlan_encapsulated_proto) {
#ifdef CONFIG_INET #ifdef CONFIG_INET
case __constant_htons(ETH_P_IP): case htons(ETH_P_IP):
/* TODO: Confirm this will work with VLAN headers... */ /* TODO: Confirm this will work with VLAN headers... */
return arp_find(veth->h_dest, skb); return arp_find(veth->h_dest, skb);
......
net/atm/br2684.c
View file @ 60678040
...@@ -375,11 +375,11 @@ static void br2684_push(struct atm_vcc *atmvcc, struct sk_buff *skb) ...@@ -375,11 +375,11 @@ static void br2684_push(struct atm_vcc *atmvcc, struct sk_buff *skb)
if (memcmp if (memcmp
(skb->data + 6, ethertype_ipv6, (skb->data + 6, ethertype_ipv6,
sizeof(ethertype_ipv6)) == 0) sizeof(ethertype_ipv6)) == 0)
skb->protocol = __constant_htons(ETH_P_IPV6); skb->protocol = htons(ETH_P_IPV6);
else if (memcmp else if (memcmp
(skb->data + 6, ethertype_ipv4, (skb->data + 6, ethertype_ipv4,
sizeof(ethertype_ipv4)) == 0) sizeof(ethertype_ipv4)) == 0)
skb->protocol = __constant_htons(ETH_P_IP); skb->protocol = htons(ETH_P_IP);
else else
goto error; goto error;
skb_pull(skb, sizeof(llc_oui_ipv4)); skb_pull(skb, sizeof(llc_oui_ipv4));
...@@ -404,9 +404,9 @@ static void br2684_push(struct atm_vcc *atmvcc, struct sk_buff *skb) ...@@ -404,9 +404,9 @@ static void br2684_push(struct atm_vcc *atmvcc, struct sk_buff *skb)
skb_reset_network_header(skb); skb_reset_network_header(skb);
iph = ip_hdr(skb); iph = ip_hdr(skb);
if (iph->version == 4) if (iph->version == 4)
skb->protocol = __constant_htons(ETH_P_IP); skb->protocol = htons(ETH_P_IP);
else if (iph->version == 6) else if (iph->version == 6)
skb->protocol = __constant_htons(ETH_P_IPV6); skb->protocol = htons(ETH_P_IPV6);
else else
goto error; goto error;
skb->pkt_type = PACKET_HOST; skb->pkt_type = PACKET_HOST;
......
net/core/dev.c
View file @ 60678040
...@@ -1675,13 +1675,13 @@ static u16 simple_tx_hash(struct net_device *dev, struct sk_buff *skb) ...@@ -1675,13 +1675,13 @@ static u16 simple_tx_hash(struct net_device *dev, struct sk_buff *skb)
} }
switch (skb->protocol) { switch (skb->protocol) {
case __constant_htons(ETH_P_IP): case htons(ETH_P_IP):
ip_proto = ip_hdr(skb)->protocol; ip_proto = ip_hdr(skb)->protocol;
addr1 = ip_hdr(skb)->saddr; addr1 = ip_hdr(skb)->saddr;
addr2 = ip_hdr(skb)->daddr; addr2 = ip_hdr(skb)->daddr;
ihl = ip_hdr(skb)->ihl; ihl = ip_hdr(skb)->ihl;
break; break;
case __constant_htons(ETH_P_IPV6): case htons(ETH_P_IPV6):
ip_proto = ipv6_hdr(skb)->nexthdr; ip_proto = ipv6_hdr(skb)->nexthdr;
addr1 = ipv6_hdr(skb)->saddr.s6_addr32[3]; addr1 = ipv6_hdr(skb)->saddr.s6_addr32[3];
addr2 = ipv6_hdr(skb)->daddr.s6_addr32[3]; addr2 = ipv6_hdr(skb)->daddr.s6_addr32[3];
......
net/ethernet/eth.c
View file @ 60678040
...@@ -129,7 +129,7 @@ int eth_rebuild_header(struct sk_buff *skb) ...@@ -129,7 +129,7 @@ int eth_rebuild_header(struct sk_buff *skb)
switch (eth->h_proto) { switch (eth->h_proto) {
#ifdef CONFIG_INET #ifdef CONFIG_INET
case __constant_htons(ETH_P_IP): case htons(ETH_P_IP):
return arp_find(eth->h_dest, skb); return arp_find(eth->h_dest, skb);
#endif #endif
default: default:
......
net/ipv4/ipvs/ip_vs_core.c
View file @ 60678040
...@@ -938,7 +938,7 @@ ip_vs_out(unsigned int hooknum, struct sk_buff *skb, ...@@ -938,7 +938,7 @@ ip_vs_out(unsigned int hooknum, struct sk_buff *skb,
EnterFunction(11); EnterFunction(11);
af = (skb->protocol == __constant_htons(ETH_P_IP)) ? AF_INET : AF_INET6; af = (skb->protocol == htons(ETH_P_IP)) ? AF_INET : AF_INET6;
if (skb->ipvs_property) if (skb->ipvs_property)
return NF_ACCEPT; return NF_ACCEPT;
...@@ -1258,7 +1258,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, ...@@ -1258,7 +1258,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb,
struct ip_vs_conn *cp; struct ip_vs_conn *cp;
int ret, restart, af; int ret, restart, af;
af = (skb->protocol == __constant_htons(ETH_P_IP)) ? AF_INET : AF_INET6; af = (skb->protocol == htons(ETH_P_IP)) ? AF_INET : AF_INET6;
ip_vs_fill_iphdr(af, skb_network_header(skb), &iph); ip_vs_fill_iphdr(af, skb_network_header(skb), &iph);
......
net/ipv6/ip6_tunnel.c
View file @ 60678040
...@@ -1050,10 +1050,10 @@ ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -1050,10 +1050,10 @@ ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
} }
switch (skb->protocol) { switch (skb->protocol) {
case __constant_htons(ETH_P_IP): case htons(ETH_P_IP):
ret = ip4ip6_tnl_xmit(skb, dev); ret = ip4ip6_tnl_xmit(skb, dev);
break; break;
case __constant_htons(ETH_P_IPV6): case htons(ETH_P_IPV6):
ret = ip6ip6_tnl_xmit(skb, dev); ret = ip6ip6_tnl_xmit(skb, dev);
break; break;
default: default:
......
net/mac80211/wme.c
View file @ 60678040
...@@ -39,7 +39,7 @@ static unsigned int classify_1d(struct sk_buff *skb) ...@@ -39,7 +39,7 @@ static unsigned int classify_1d(struct sk_buff *skb)
return skb->priority - 256; return skb->priority - 256;
switch (skb->protocol) { switch (skb->protocol) {
case __constant_htons(ETH_P_IP): case htons(ETH_P_IP):
dscp = ip_hdr(skb)->tos & 0xfc; dscp = ip_hdr(skb)->tos & 0xfc;
break; break;
......
net/sched/cls_flow.c
View file @ 60678040
...@@ -67,9 +67,9 @@ static inline u32 addr_fold(void *addr) ...@@ -67,9 +67,9 @@ static inline u32 addr_fold(void *addr)
static u32 flow_get_src(const struct sk_buff *skb) static u32 flow_get_src(const struct sk_buff *skb)
{ {
switch (skb->protocol) { switch (skb->protocol) {
case __constant_htons(ETH_P_IP): case htons(ETH_P_IP):
return ntohl(ip_hdr(skb)->saddr); return ntohl(ip_hdr(skb)->saddr);
case __constant_htons(ETH_P_IPV6): case htons(ETH_P_IPV6):
return ntohl(ipv6_hdr(skb)->saddr.s6_addr32[3]); return ntohl(ipv6_hdr(skb)->saddr.s6_addr32[3]);
default: default:
return addr_fold(skb->sk); return addr_fold(skb->sk);
...@@ -79,9 +79,9 @@ static u32 flow_get_src(const struct sk_buff *skb) ...@@ -79,9 +79,9 @@ static u32 flow_get_src(const struct sk_buff *skb)
static u32 flow_get_dst(const struct sk_buff *skb) static u32 flow_get_dst(const struct sk_buff *skb)
{ {
switch (skb->protocol) { switch (skb->protocol) {
case __constant_htons(ETH_P_IP): case htons(ETH_P_IP):
return ntohl(ip_hdr(skb)->daddr); return ntohl(ip_hdr(skb)->daddr);
case __constant_htons(ETH_P_IPV6): case htons(ETH_P_IPV6):
return ntohl(ipv6_hdr(skb)->daddr.s6_addr32[3]); return ntohl(ipv6_hdr(skb)->daddr.s6_addr32[3]);
default: default:
return addr_fold(skb->dst) ^ (__force u16)skb->protocol; return addr_fold(skb->dst) ^ (__force u16)skb->protocol;
...@@ -91,9 +91,9 @@ static u32 flow_get_dst(const struct sk_buff *skb) ...@@ -91,9 +91,9 @@ static u32 flow_get_dst(const struct sk_buff *skb)
static u32 flow_get_proto(const struct sk_buff *skb) static u32 flow_get_proto(const struct sk_buff *skb)
{ {
switch (skb->protocol) { switch (skb->protocol) {
case __constant_htons(ETH_P_IP): case htons(ETH_P_IP):
return ip_hdr(skb)->protocol; return ip_hdr(skb)->protocol;
case __constant_htons(ETH_P_IPV6): case htons(ETH_P_IPV6):
return ipv6_hdr(skb)->nexthdr; return ipv6_hdr(skb)->nexthdr;
default: default:
return 0; return 0;
...@@ -120,7 +120,7 @@ static u32 flow_get_proto_src(const struct sk_buff *skb) ...@@ -120,7 +120,7 @@ static u32 flow_get_proto_src(const struct sk_buff *skb)
u32 res = 0; u32 res = 0;
switch (skb->protocol) { switch (skb->protocol) {
case __constant_htons(ETH_P_IP): { case htons(ETH_P_IP): {
struct iphdr *iph = ip_hdr(skb); struct iphdr *iph = ip_hdr(skb);
if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) && if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
...@@ -128,7 +128,7 @@ static u32 flow_get_proto_src(const struct sk_buff *skb) ...@@ -128,7 +128,7 @@ static u32 flow_get_proto_src(const struct sk_buff *skb)
res = ntohs(*(__be16 *)((void *)iph + iph->ihl * 4)); res = ntohs(*(__be16 *)((void *)iph + iph->ihl * 4));
break; break;
} }
case __constant_htons(ETH_P_IPV6): { case htons(ETH_P_IPV6): {
struct ipv6hdr *iph = ipv6_hdr(skb); struct ipv6hdr *iph = ipv6_hdr(skb);
if (has_ports(iph->nexthdr)) if (has_ports(iph->nexthdr))
...@@ -147,7 +147,7 @@ static u32 flow_get_proto_dst(const struct sk_buff *skb) ...@@ -147,7 +147,7 @@ static u32 flow_get_proto_dst(const struct sk_buff *skb)
u32 res = 0; u32 res = 0;
switch (skb->protocol) { switch (skb->protocol) {
case __constant_htons(ETH_P_IP): { case htons(ETH_P_IP): {
struct iphdr *iph = ip_hdr(skb); struct iphdr *iph = ip_hdr(skb);
if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) && if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&
...@@ -155,7 +155,7 @@ static u32 flow_get_proto_dst(const struct sk_buff *skb) ...@@ -155,7 +155,7 @@ static u32 flow_get_proto_dst(const struct sk_buff *skb)
res = ntohs(*(__be16 *)((void *)iph + iph->ihl * 4 + 2)); res = ntohs(*(__be16 *)((void *)iph + iph->ihl * 4 + 2));
break; break;
} }
case __constant_htons(ETH_P_IPV6): { case htons(ETH_P_IPV6): {
struct ipv6hdr *iph = ipv6_hdr(skb); struct ipv6hdr *iph = ipv6_hdr(skb);
if (has_ports(iph->nexthdr)) if (has_ports(iph->nexthdr))
...@@ -213,9 +213,9 @@ static u32 flow_get_nfct(const struct sk_buff *skb) ...@@ -213,9 +213,9 @@ static u32 flow_get_nfct(const struct sk_buff *skb)
static u32 flow_get_nfct_src(const struct sk_buff *skb) static u32 flow_get_nfct_src(const struct sk_buff *skb)
{ {
switch (skb->protocol) { switch (skb->protocol) {
case __constant_htons(ETH_P_IP): case htons(ETH_P_IP):
return ntohl(CTTUPLE(skb, src.u3.ip)); return ntohl(CTTUPLE(skb, src.u3.ip));
case __constant_htons(ETH_P_IPV6): case htons(ETH_P_IPV6):
return ntohl(CTTUPLE(skb, src.u3.ip6[3])); return ntohl(CTTUPLE(skb, src.u3.ip6[3]));
} }
fallback: fallback:
...@@ -225,9 +225,9 @@ static u32 flow_get_nfct_src(const struct sk_buff *skb) ...@@ -225,9 +225,9 @@ static u32 flow_get_nfct_src(const struct sk_buff *skb)
static u32 flow_get_nfct_dst(const struct sk_buff *skb) static u32 flow_get_nfct_dst(const struct sk_buff *skb)
{ {
switch (skb->protocol) { switch (skb->protocol) {
case __constant_htons(ETH_P_IP): case htons(ETH_P_IP):
return ntohl(CTTUPLE(skb, dst.u3.ip)); return ntohl(CTTUPLE(skb, dst.u3.ip));
case __constant_htons(ETH_P_IPV6): case htons(ETH_P_IPV6):
return ntohl(CTTUPLE(skb, dst.u3.ip6[3])); return ntohl(CTTUPLE(skb, dst.u3.ip6[3]));
} }
fallback: fallback:
......
net/sched/sch_dsmark.c
View file @ 60678040
...@@ -202,7 +202,7 @@ static int dsmark_enqueue(struct sk_buff *skb, struct Qdisc *sch) ...@@ -202,7 +202,7 @@ static int dsmark_enqueue(struct sk_buff *skb, struct Qdisc *sch)
if (p->set_tc_index) { if (p->set_tc_index) {
switch (skb->protocol) { switch (skb->protocol) {
case __constant_htons(ETH_P_IP): case htons(ETH_P_IP):
if (skb_cow_head(skb, sizeof(struct iphdr))) if (skb_cow_head(skb, sizeof(struct iphdr)))
goto drop; goto drop;
...@@ -210,7 +210,7 @@ static int dsmark_enqueue(struct sk_buff *skb, struct Qdisc *sch) ...@@ -210,7 +210,7 @@ static int dsmark_enqueue(struct sk_buff *skb, struct Qdisc *sch)
& ~INET_ECN_MASK; & ~INET_ECN_MASK;
break; break;
case __constant_htons(ETH_P_IPV6): case htons(ETH_P_IPV6):
if (skb_cow_head(skb, sizeof(struct ipv6hdr))) if (skb_cow_head(skb, sizeof(struct ipv6hdr)))
goto drop; goto drop;
...@@ -289,11 +289,11 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch) ...@@ -289,11 +289,11 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch)
pr_debug("index %d->%d\n", skb->tc_index, index); pr_debug("index %d->%d\n", skb->tc_index, index);
switch (skb->protocol) { switch (skb->protocol) {
case __constant_htons(ETH_P_IP): case htons(ETH_P_IP):
ipv4_change_dsfield(ip_hdr(skb), p->mask[index], ipv4_change_dsfield(ip_hdr(skb), p->mask[index],
p->value[index]); p->value[index]);
break; break;
case __constant_htons(ETH_P_IPV6): case htons(ETH_P_IPV6):
ipv6_change_dsfield(ipv6_hdr(skb), p->mask[index], ipv6_change_dsfield(ipv6_hdr(skb), p->mask[index],
p->value[index]); p->value[index]);
break; break;
......
net/sched/sch_sfq.c
View file @ 60678040
...@@ -119,7 +119,7 @@ static unsigned sfq_hash(struct sfq_sched_data *q, struct sk_buff *skb) ...@@ -119,7 +119,7 @@ static unsigned sfq_hash(struct sfq_sched_data *q, struct sk_buff *skb)
u32 h, h2; u32 h, h2;
switch (skb->protocol) { switch (skb->protocol) {
case __constant_htons(ETH_P_IP): case htons(ETH_P_IP):
{ {
const struct iphdr *iph = ip_hdr(skb); const struct iphdr *iph = ip_hdr(skb);
h = iph->daddr; h = iph->daddr;
...@@ -134,7 +134,7 @@ static unsigned sfq_hash(struct sfq_sched_data *q, struct sk_buff *skb) ...@@ -134,7 +134,7 @@ static unsigned sfq_hash(struct sfq_sched_data *q, struct sk_buff *skb)
h2 ^= *(((u32*)iph) + iph->ihl); h2 ^= *(((u32*)iph) + iph->ihl);
break; break;
} }
case __constant_htons(ETH_P_IPV6): case htons(ETH_P_IPV6):
{ {
struct ipv6hdr *iph = ipv6_hdr(skb); struct ipv6hdr *iph = ipv6_hdr(skb);
h = iph->daddr.s6_addr32[3]; h = iph->daddr.s6_addr32[3];
......
net/sunrpc/xprtrdma/rpc_rdma.c
View file @ 60678040
...@@ -769,7 +769,7 @@ rpcrdma_reply_handler(struct rpcrdma_rep *rep) ...@@ -769,7 +769,7 @@ rpcrdma_reply_handler(struct rpcrdma_rep *rep)
/* check for expected message types */ /* check for expected message types */
/* The order of some of these tests is important. */ /* The order of some of these tests is important. */
switch (headerp->rm_type) { switch (headerp->rm_type) {
case __constant_htonl(RDMA_MSG): case htonl(RDMA_MSG):
/* never expect read chunks */ /* never expect read chunks */
/* never expect reply chunks (two ways to check) */ /* never expect reply chunks (two ways to check) */
/* never expect write chunks without having offered RDMA */ /* never expect write chunks without having offered RDMA */
...@@ -802,7 +802,7 @@ rpcrdma_reply_handler(struct rpcrdma_rep *rep) ...@@ -802,7 +802,7 @@ rpcrdma_reply_handler(struct rpcrdma_rep *rep)
rpcrdma_inline_fixup(rqst, (char *)iptr, rep->rr_len); rpcrdma_inline_fixup(rqst, (char *)iptr, rep->rr_len);
break; break;
case __constant_htonl(RDMA_NOMSG): case htonl(RDMA_NOMSG):
/* never expect read or write chunks, always reply chunks */ /* never expect read or write chunks, always reply chunks */
if (headerp->rm_body.rm_chunks[0] != xdr_zero || if (headerp->rm_body.rm_chunks[0] != xdr_zero ||
headerp->rm_body.rm_chunks[1] != xdr_zero || headerp->rm_body.rm_chunks[1] != xdr_zero ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7