Skip to content

Commit

Permalink
net: ntohs() misuse
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Jun 12, 2009
1 parent 3ee40c3 commit 17d0cdf
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/net/atl1e/atl1e_main.c
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion drivers/net/atlx/atl1.c
Original file line number Diff line number Diff line change
@@ -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)) {
2 changes: 1 addition & 1 deletion drivers/net/ioc3-eth.c
Original file line number Diff line number Diff line change
@@ -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);

0 comments on commit 17d0cdf

Please sign in to comment.