diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-06-11 20:23:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-11 20:23:24 -0400 |
commit | 17d0cdfa8f3c09a110061c67421d662b3e149d0a (patch) | |
tree | 5e707b8787db0a8571b983a6c8c1d7bf88579788 /drivers | |
parent | 3ee40c376ad3252d13946141588db7e2f435f958 (diff) |
net: ntohs() misuse
Some drivers incorrectly use ntohs() instead of htons()
A cleanup as htons() returns same result than ntohs(),
but better to use the proper one.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/atl1e/atl1e_main.c | 4 | ||||
-rw-r--r-- | drivers/net/atlx/atl1.c | 2 | ||||
-rw-r--r-- | drivers/net/ioc3-eth.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index e1ae10cf30c1..9fc6d6d9060e 100644 --- a/drivers/net/atl1e/atl1e_main.c +++ b/drivers/net/atl1e/atl1e_main.c | |||
@@ -1602,7 +1602,7 @@ static u16 atl1e_cal_tdp_req(const struct sk_buff *skb) | |||
1602 | } | 1602 | } |
1603 | 1603 | ||
1604 | if (skb_is_gso(skb)) { | 1604 | if (skb_is_gso(skb)) { |
1605 | if (skb->protocol == ntohs(ETH_P_IP) || | 1605 | if (skb->protocol == htons(ETH_P_IP) || |
1606 | (skb_shinfo(skb)->gso_type == SKB_GSO_TCPV6)) { | 1606 | (skb_shinfo(skb)->gso_type == SKB_GSO_TCPV6)) { |
1607 | proto_hdr_len = skb_transport_offset(skb) + | 1607 | proto_hdr_len = skb_transport_offset(skb) + |
1608 | tcp_hdrlen(skb); | 1608 | tcp_hdrlen(skb); |
@@ -1878,7 +1878,7 @@ static int atl1e_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
1878 | TPD_VLAN_SHIFT; | 1878 | TPD_VLAN_SHIFT; |
1879 | } | 1879 | } |
1880 | 1880 | ||
1881 | if (skb->protocol == ntohs(ETH_P_8021Q)) | 1881 | if (skb->protocol == htons(ETH_P_8021Q)) |
1882 | tpd->word3 |= 1 << TPD_VL_TAGGED_SHIFT; | 1882 | tpd->word3 |= 1 << TPD_VL_TAGGED_SHIFT; |
1883 | 1883 | ||
1884 | if (skb_network_offset(skb) != ETH_HLEN) | 1884 | if (skb_network_offset(skb) != ETH_HLEN) |
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 560f3873d347..94d7325caf4f 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c | |||
@@ -2382,7 +2382,7 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
2382 | 2382 | ||
2383 | mss = skb_shinfo(skb)->gso_size; | 2383 | mss = skb_shinfo(skb)->gso_size; |
2384 | if (mss) { | 2384 | if (mss) { |
2385 | if (skb->protocol == ntohs(ETH_P_IP)) { | 2385 | if (skb->protocol == htons(ETH_P_IP)) { |
2386 | proto_hdr_len = (skb_transport_offset(skb) + | 2386 | proto_hdr_len = (skb_transport_offset(skb) + |
2387 | tcp_hdrlen(skb)); | 2387 | tcp_hdrlen(skb)); |
2388 | if (unlikely(proto_hdr_len > len)) { | 2388 | if (unlikely(proto_hdr_len > len)) { |
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c index c5593f4665a4..e3cfefab670c 100644 --- a/drivers/net/ioc3-eth.c +++ b/drivers/net/ioc3-eth.c | |||
@@ -530,7 +530,7 @@ static void ioc3_tcpudp_checksum(struct sk_buff *skb, uint32_t hwsum, int len) | |||
530 | * case where the checksum is right the higher layers will still | 530 | * case where the checksum is right the higher layers will still |
531 | * drop the packet as appropriate. | 531 | * drop the packet as appropriate. |
532 | */ | 532 | */ |
533 | if (eh->h_proto != ntohs(ETH_P_IP)) | 533 | if (eh->h_proto != htons(ETH_P_IP)) |
534 | return; | 534 | return; |
535 | 535 | ||
536 | ih = (struct iphdr *) ((char *)eh + ETH_HLEN); | 536 | ih = (struct iphdr *) ((char *)eh + ETH_HLEN); |