Skip to contentSkip to conversation

atl1 trivial endianness misannotations

PATCH In review Al Viro 3 participants 3 messages Mar 14, 2007 – Mar 15, 2007 Network drivers

lore
Share & tools
lore

Al Viro

author
#0 lore raw

PATCH 14/17 atl1 trivial endianness misannotations

NB: driver is choke-full of code that will break on big-endian; as long as the hardware is onboard-only we can live with that, but sooner or later that'll need fixing.

Signed-off-by Al Viro <[email protected]>
---
 drivers/net/atl1/atl1_main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/atl1/atl1_main.c +2 -2
index 88d4f70..dee3638 100644
@@ -1328,7 +1328,7 @@ static int atl1_tx_csum(struct atl1_adapter *adapter, struct sk_buff *skb,
 
 	if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
 		cso = skb->h.raw - skb->data;
-		css = (skb->h.raw + skb->csum) - skb->data;
+		css = (skb->h.raw + skb->csum_offset) - skb->data;
 		if (unlikely(cso & 0x1)) {
 			printk(KERN_DEBUG "%s: payload offset != even number\n",
 				atl1_driver_name);

@@ -1562,7 +1562,7 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 	/* mss will be nonzero if we're doing segment offload (TSO/GSO) */
 	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->h.raw - skb->data) +
 					 (skb->h.th->doff << 2));
 			if (unlikely(proto_hdr_len > len)) {
Signature · 1 line
1.5.0-rc2.GIT
#1 lore raw
Quoted 8 lines · Al Viro

NB: driver is choke-full of code that will break on big-endian; as long as the hardware is onboard-only we can live with that, but sooner or later that'll need fixing.

Signed-off-by Al Viro <[email protected]>
---
 drivers/net/atl1/atl1_main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

ACK

#2 lore raw
In reply to Al Viro
Quoted 14 lines · Al Viro

NB: driver is choke-full of code that will break on big-endian; as long as the hardware is onboard-only we can live with that, but sooner or later that'll need fixing.

Signed-off-by Al Viro <[email protected]>
---
 drivers/net/atl1/atl1_main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/atl1/atl1_main.c +0 -0
index 88d4f70..dee3638 100644

drivers/net/atl1/atl1_main.c static int atl1_tx_csum(struct atl1_adapter *adapter, struct sk_buff *skb, · line 1334

Quoted 8 lines
drivers/net/atl1/atl1_main.c +1 -1
@@ -1328,7 +1328,7 @@ static int atl1_tx_csum(struct atl1_adapter *adapter, struct sk_buff *skb,
 
 	if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
 		cso = skb->h.raw - skb->data;
-		css = (skb->h.raw + skb->csum) - skb->data;
+		css = (skb->h.raw + skb->csum_offset) - skb->data;
 		if (unlikely(cso & 0x1)) {
 			printk(KERN_DEBUG "%s: payload offset != even number\n",
 				atl1_driver_name);

This could certainly explain some checksumming problems we've seen.

drivers/net/atl1/atl1_main.c static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev) · line 1568

Quoted 9 lines
drivers/net/atl1/atl1_main.c +1 -1
@@ -1562,7 +1562,7 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 	/* mss will be nonzero if we're doing segment offload (TSO/GSO) */
 	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->h.raw - skb->data) +
 					 (skb->h.th->doff << 2));
 			if (unlikely(proto_hdr_len > len)) {

ACK.