diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2008-09-21 01:20:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-09-21 01:20:49 -0400 |
commit | 6067804047b64dde89f4f133fc7eba48ee44107d (patch) | |
tree | abe87787c3ad2aee82e576c7d4128e29bb296ac0 /net/atm/br2684.c | |
parent | a574420ff46cff0245e6b0fce2e961aa2717743d (diff) |
net: Use hton[sl]() instead of __constant_hton[sl]() where applicable
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/atm/br2684.c')
-rw-r--r-- | net/atm/br2684.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c index 8d9a6f158880..280de481edc7 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c | |||
@@ -375,11 +375,11 @@ static void br2684_push(struct atm_vcc *atmvcc, struct sk_buff *skb) | |||
375 | if (memcmp | 375 | if (memcmp |
376 | (skb->data + 6, ethertype_ipv6, | 376 | (skb->data + 6, ethertype_ipv6, |
377 | sizeof(ethertype_ipv6)) == 0) | 377 | sizeof(ethertype_ipv6)) == 0) |
378 | skb->protocol = __constant_htons(ETH_P_IPV6); | 378 | skb->protocol = htons(ETH_P_IPV6); |
379 | else if (memcmp | 379 | else if (memcmp |
380 | (skb->data + 6, ethertype_ipv4, | 380 | (skb->data + 6, ethertype_ipv4, |
381 | sizeof(ethertype_ipv4)) == 0) | 381 | sizeof(ethertype_ipv4)) == 0) |
382 | skb->protocol = __constant_htons(ETH_P_IP); | 382 | skb->protocol = htons(ETH_P_IP); |
383 | else | 383 | else |
384 | goto error; | 384 | goto error; |
385 | skb_pull(skb, sizeof(llc_oui_ipv4)); | 385 | skb_pull(skb, sizeof(llc_oui_ipv4)); |
@@ -404,9 +404,9 @@ static void br2684_push(struct atm_vcc *atmvcc, struct sk_buff *skb) | |||
404 | skb_reset_network_header(skb); | 404 | skb_reset_network_header(skb); |
405 | iph = ip_hdr(skb); | 405 | iph = ip_hdr(skb); |
406 | if (iph->version == 4) | 406 | if (iph->version == 4) |
407 | skb->protocol = __constant_htons(ETH_P_IP); | 407 | skb->protocol = htons(ETH_P_IP); |
408 | else if (iph->version == 6) | 408 | else if (iph->version == 6) |
409 | skb->protocol = __constant_htons(ETH_P_IPV6); | 409 | skb->protocol = htons(ETH_P_IPV6); |
410 | else | 410 | else |
411 | goto error; | 411 | goto error; |
412 | skb->pkt_type = PACKET_HOST; | 412 | skb->pkt_type = PACKET_HOST; |