diff options
| author |   Al Viro <viro@ftp.linux.org.uk> | 2007-12-17 06:48:04 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-01-28 15:07:10 -0800 |
| commit | 439104b3a39b2f576daa229d783eb2cefac8b7df (patch) | |
| tree | 176bbf470b922bd6b0057006cd7e351eb6b972e8 | |
| parent | sunhme endianness annotations (diff) | |
| download | linux-dev-439104b3a39b2f576daa229d783eb2cefac8b7df.tar.xz linux-dev-439104b3a39b2f576daa229d783eb2cefac8b7df.zip | |
sungem endianness annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | drivers/net/sungem.c | 8 | ||||
| -rw-r--r-- | drivers/net/sungem.h | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 68872142530b..467d80dc3b33 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -758,6 +758,7 @@ static int gem_rx(struct gem *gp, int work_to_do) { int entry, drops, work_done = 0; u32 done; + __sum16 csum; if (netif_msg_rx_status(gp)) printk(KERN_DEBUG "%s: rx interrupt, done: %d, rx_new: %d\n", @@ -769,7 +770,7 @@ static int gem_rx(struct gem *gp, int work_to_do) for (;;) { struct gem_rxd *rxd = &gp->init_block->rxd[entry]; struct sk_buff *skb; - u64 status = cpu_to_le64(rxd->status_word); + u64 status = le64_to_cpu(rxd->status_word); dma_addr_t dma_addr; int len; @@ -811,7 +812,7 @@ static int gem_rx(struct gem *gp, int work_to_do) goto next; } - dma_addr = cpu_to_le64(rxd->buffer); + dma_addr = le64_to_cpu(rxd->buffer); if (len > RX_COPY_THRESHOLD) { struct sk_buff *new_skb; @@ -853,7 +854,8 @@ static int gem_rx(struct gem *gp, int work_to_do) skb = copy_skb; } - skb->csum = ntohs((status & RXDCTRL_TCPCSUM) ^ 0xffff); + csum = (__force __sum16)htons((status & RXDCTRL_TCPCSUM) ^ 0xffff); + skb->csum = csum_unfold(csum); skb->ip_summed = CHECKSUM_COMPLETE; skb->protocol = eth_type_trans(skb, gp->dev); diff --git a/drivers/net/sungem.h b/drivers/net/sungem.h index 76d760acc9e2..f7a02917ce5e 100644 --- a/drivers/net/sungem.h +++ b/drivers/net/sungem.h @@ -828,8 +828,8 @@ * DMA mappings for a transmitted packet. */ struct gem_txd { - u64 control_word; - u64 buffer; + __le64 control_word; + __le64 buffer; }; #define TXDCTRL_BUFSZ 0x0000000000007fffULL /* Buffer Size */ @@ -863,8 +863,8 @@ struct gem_txd { * by the host driver just as in the TX descriptor case above. */ struct gem_rxd { - u64 status_word; - u64 buffer; + __le64 status_word; + __le64 buffer; }; #define RXDCTRL_TCPCSUM 0x000000000000ffffULL /* TCP Pseudo-CSUM */ |