net: ntohs() misuse
Subsystems (2)
PATCH 1/1 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 <[email protected]>
--- drivers/net/atl1e/atl1e_main.c | 4 ++-- drivers/net/atlx/atl1.c | 2 +- drivers/net/ioc3-eth.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/atl1e/atl1e_main.c +2 -2
@@ -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 )
drivers/net/atlx/atl1.c +1 -1
@@ -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)) {
drivers/net/ioc3-eth.c +1 -1
@@ -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 );
From: Eric Dumazet <[email protected]>
Date: Thu, 11 Jun 2009 21:23:15 +0200
Quoted 6 lines
Some drivers incorrectly use
ntohs()instead ofhtons()A cleanup as
htons()returns same result thanntohs(), but better to use the proper one.Signed-off-by Eric Dumazet <[email protected]>
Applied, thanks Eric.