From 0a3922c499fd64c8bb30a0a212d65aebf0e4f857 Mon Sep 17 00:00:00 2001 From: Jitendra Kalsaria Date: Fri, 3 Feb 2012 14:06:49 +0000 Subject: [PATCH] --- yaml --- r: 289871 b: refs/heads/master c: e02ef3311ae7329335d7c2b954b3988f7628a109 h: refs/heads/master i: 289869: 2e998f14c4ab068d9815d24d1a2a2a0d7a0f3f2f 289867: e399fd3684c30cffe200031e73618193f8db35ab 289863: 73330ed2c1e43a6471e1fccaee7a0d7247ba07e6 289855: 0c34e79110680428e4d3c75b44b25e5bd96c7808 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/qlogic/qlge/qlge_main.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ab8b8ef15e30..066de50913c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97bf2262e7f8177706ecdac897be165c0b455c6f +refs/heads/master: e02ef3311ae7329335d7c2b954b3988f7628a109 diff --git a/trunk/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/trunk/drivers/net/ethernet/qlogic/qlge/qlge_main.c index b54898737284..582b23746876 100644 --- a/trunk/drivers/net/ethernet/qlogic/qlge/qlge_main.c +++ b/trunk/drivers/net/ethernet/qlogic/qlge/qlge_main.c @@ -1576,13 +1576,14 @@ static void ql_process_mac_rx_page(struct ql_adapter *qdev, } else if ((ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_U) && (ib_mac_rsp->flags3 & IB_MAC_IOCB_RSP_V4)) { /* Unfragmented ipv4 UDP frame. */ - struct iphdr *iph = (struct iphdr *) skb->data; + struct iphdr *iph = + (struct iphdr *) ((u8 *)addr + ETH_HLEN); if (!(iph->frag_off & cpu_to_be16(IP_MF|IP_OFFSET))) { skb->ip_summed = CHECKSUM_UNNECESSARY; netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev, - "TCP checksum done!\n"); + "UDP checksum done!\n"); } } } @@ -1690,7 +1691,7 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev, skb->ip_summed = CHECKSUM_UNNECESSARY; netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev, - "TCP checksum done!\n"); + "UDP checksum done!\n"); } } }