diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-06-11 17:23:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-11 17:23:24 -0700 |
| commit | 17d0cdfa8f3c09a110061c67421d662b3e149d0a (patch) | |
| tree | 5e707b8787db0a8571b983a6c8c1d7bf88579788 /drivers/net | |
| parent | 3ee40c376ad3252d13946141588db7e2f435f958 (diff) | |
| download | op-kernel-dev-17d0cdfa8f3c09a110061c67421d662b3e149d0a.zip op-kernel-dev-17d0cdfa8f3c09a110061c67421d662b3e149d0a.tar.gz | |
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/net')
| -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 e1ae10c..9fc6d6d 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) } if (skb_is_gso(skb)) { - if (skb->protocol == ntohs(ETH_P_IP) || + if (skb->protocol == htons(ETH_P_IP) || (skb_shinfo(skb)->gso_type == SKB_GSO_TCPV6)) { proto_hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb); @@ -1878,7 +1878,7 @@ static int atl1e_xmit_frame(struct sk_buff *skb, struct net_device *netdev) TPD_VLAN_SHIFT; } - if (skb->protocol == ntohs(ETH_P_8021Q)) + if (skb->protocol == htons(ETH_P_8021Q)) tpd->word3 |= 1 << TPD_VL_TAGGED_SHIFT; if (skb_network_offset(skb) != ETH_HLEN) diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 560f387..94d7325 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) mss = skb_shinfo(skb)->gso_size; if (mss) { - if (skb->protocol == ntohs(ETH_P_IP)) { + if (skb->protocol == htons(ETH_P_IP)) { proto_hdr_len = (skb_transport_offset(skb) + tcp_hdrlen(skb)); if (unlikely(proto_hdr_len > len)) { diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c index c5593f4..e3cfefa 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) * case where the checksum is right the higher layers will still * drop the packet as appropriate. */ - if (eh->h_proto != ntohs(ETH_P_IP)) + if (eh->h_proto != htons(ETH_P_IP)) return; ih = (struct iphdr *) ((char *)eh + ETH_HLEN); |
