Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7ccec1b94e456b01cbef7cfb1bc97e2b76f24ab5
Commit:     7ccec1b94e456b01cbef7cfb1bc97e2b76f24ab5
Parent:     1be9ab056e94e23a307b8bfaacc38403b3b5a352
Author:     Al Viro <[EMAIL PROTECTED]>
AuthorDate: Wed Mar 14 09:20:10 2007 +0000
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Mar 14 15:27:50 2007 -0700

    [PATCH] 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]>
    Acked-by: Jeff Garzik <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 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)) {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to