From d5ababb0d4aae0924d0af1f44d198c5b8ac5c891 Mon Sep 17 00:00:00 2001
From: Ron Mercer <ron.mercer@qlogic.com>
Date: Mon, 5 Jul 2010 12:19:40 +0000
Subject: [PATCH] --- yaml --- r: 203391 b: refs/heads/master c:
 6d29b1ef311d96e737084032a4b080653015aedf h: refs/heads/master i:   203389:
 0a437588b3f22d218021ef161a2ed0aa73deb793   203387:
 759d3fd64db70163eeaaf85f828900c0100fa571   203383:
 c79872acbdc04af7ae6a1aea98426d3f0038f5a5   203375:
 90f19118009811c9dbf8e4a90f2772231317c0fb   203359:
 fe77f838ee83d75a9e630a1d516dcb1f9d7b95ab   203327:
 323f60d7c39e46ff9864c787928fe6ccbdfdddfa   203263:
 3bdc87783cdb38f1e6972ccfb736c7854ce67106 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/qlge/qlge_main.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f9a183a96fa4..774cd38cc7ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b11d36ec25cdd69929b8abe867984c8ab2b50a4
+refs/heads/master: 6d29b1ef311d96e737084032a4b080653015aedf
diff --git a/trunk/drivers/net/qlge/qlge_main.c b/trunk/drivers/net/qlge/qlge_main.c
index e39451b5196e..a41b6b564042 100644
--- a/trunk/drivers/net/qlge/qlge_main.c
+++ b/trunk/drivers/net/qlge/qlge_main.c
@@ -1677,7 +1677,7 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev,
 			/* Unfragmented ipv4 UDP frame. */
 			struct iphdr *iph = (struct iphdr *) skb->data;
 			if (!(iph->frag_off &
-				cpu_to_be16(IP_MF|IP_OFFSET))) {
+				ntohs(IP_MF|IP_OFFSET))) {
 				skb->ip_summed = CHECKSUM_UNNECESSARY;
 				netif_printk(qdev, rx_status, KERN_DEBUG,
 					     qdev->ndev,
@@ -1997,7 +1997,7 @@ static void ql_process_mac_split_rx_intr(struct ql_adapter *qdev,
 		/* Unfragmented ipv4 UDP frame. */
 			struct iphdr *iph = (struct iphdr *) skb->data;
 			if (!(iph->frag_off &
-				cpu_to_be16(IP_MF|IP_OFFSET))) {
+				ntohs(IP_MF|IP_OFFSET))) {
 				skb->ip_summed = CHECKSUM_UNNECESSARY;
 				netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
 					     "TCP checksum done!\n");