Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / atlx / atl1.c

diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 3acf5123a6efa8c0e21d76b7deb487a76d21ea3e..3b527687c28fa9ba3509defb224ac08ca32665e9 100644 (file)
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -2174,7 +2174,7 @@ static int atl1_tx_csum(struct atl1_adapter *adapter, struct sk_buff *skb,
        u8 css, cso;
 
        if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
-               css = (u8) (skb->csum_start - skb_headroom(skb));
+               css = skb_checksum_start_offset(skb);
                cso = css + (u8) skb->csum_offset;
                if (unlikely(css & 0x1)) {
                        /* L1 hardware requires an even number here */