[PATCH 14/17] atl1 trivial endianness misannotations

[PATCH 14/17] atl1 trivial endianness misannotations

[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 <viro@zeniv.linux.org.uk>
---
 drivers/net/atl1/atl1_main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c
index 88d4f70..dee3638 100644
--- a/drivers/net/atl1/atl1_main.c
+++ b/drivers/net/atl1/atl1_main.c
@@ -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)) {
-- 
1.5.0-rc2.GIT

Re: [PATCH 14/17] atl1 trivial endianness misannotations

[Jeff Garzik]

Al Viro wrote:
> 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 <viro@zeniv.linux.org.uk>
> ---
>  drivers/net/atl1/atl1_main.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

ACK

Re: [PATCH 14/17] atl1 trivial endianness misannotations

[Chris Snook]

Al Viro wrote:
> 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 <viro@zeniv.linux.org.uk>
> ---
>  drivers/net/atl1/atl1_main.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c
> index 88d4f70..dee3638 100644
> --- a/drivers/net/atl1/atl1_main.c
> +++ b/drivers/net/atl1/atl1_main.c
> @@ -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.

> @@ -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.