|
@@ -1328,7 +1328,7 @@ static int atl1_tx_csum(struct atl1_adapter *adapter, struct sk_buff *skb,
|
|
|
|
|
|
if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
|
|
if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
|
|
cso = skb->h.raw - skb->data;
|
|
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)) {
|
|
if (unlikely(cso & 0x1)) {
|
|
printk(KERN_DEBUG "%s: payload offset != even number\n",
|
|
printk(KERN_DEBUG "%s: payload offset != even number\n",
|
|
atl1_driver_name);
|
|
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 will be nonzero if we're doing segment offload (TSO/GSO) */
|
|
mss = skb_shinfo(skb)->gso_size;
|
|
mss = skb_shinfo(skb)->gso_size;
|
|
if (mss) {
|
|
if (mss) {
|
|
- if (skb->protocol == ntohs(ETH_P_IP)) {
|
|
|
|
|
|
+ if (skb->protocol == htons(ETH_P_IP)) {
|
|
proto_hdr_len = ((skb->h.raw - skb->data) +
|
|
proto_hdr_len = ((skb->h.raw - skb->data) +
|
|
(skb->h.th->doff << 2));
|
|
(skb->h.th->doff << 2));
|
|
if (unlikely(proto_hdr_len > len)) {
|
|
if (unlikely(proto_hdr_len > len)) {
|