aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2006-05-23 17:52:21 -0400
committerJeff Garzik <jeff@garzik.org>2006-05-26 21:29:09 -0400
commit6082823632e40737515d03381e1ba59cfb4d4909 (patch)
treebe9f17d81216d3fdf3cbd5ce659c43d523876eb8
parentcbc696a5fa3942aa2e6ad52a71d5126ffa84d031 (diff)
[PATCH] e1000: endian fixes
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Cc: "Ronciak, John" <john.ronciak@intel.com> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> Acked-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/e1000/e1000_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 258c7d53930e..bd709e562778 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2392,7 +2392,7 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
2392 2392
2393 hdr_len = ((skb->h.raw - skb->data) + (skb->h.th->doff << 2)); 2393 hdr_len = ((skb->h.raw - skb->data) + (skb->h.th->doff << 2));
2394 mss = skb_shinfo(skb)->tso_size; 2394 mss = skb_shinfo(skb)->tso_size;
2395 if (skb->protocol == ntohs(ETH_P_IP)) { 2395 if (skb->protocol == htons(ETH_P_IP)) {
2396 skb->nh.iph->tot_len = 0; 2396 skb->nh.iph->tot_len = 0;
2397 skb->nh.iph->check = 0; 2397 skb->nh.iph->check = 0;
2398 skb->h.th->check = 2398 skb->h.th->check =
@@ -2871,7 +2871,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
2871 /* Old method was to assume IPv4 packet by default if TSO was enabled. 2871 /* Old method was to assume IPv4 packet by default if TSO was enabled.
2872 * 82571 hardware supports TSO capabilities for IPv6 as well... 2872 * 82571 hardware supports TSO capabilities for IPv6 as well...
2873 * no longer assume, we must. */ 2873 * no longer assume, we must. */
2874 if (likely(skb->protocol == ntohs(ETH_P_IP))) 2874 if (likely(skb->protocol == htons(ETH_P_IP)))
2875 tx_flags |= E1000_TX_FLAGS_IPV4; 2875 tx_flags |= E1000_TX_FLAGS_IPV4;
2876 2876
2877 e1000_tx_queue(adapter, tx_ring, tx_flags, 2877 e1000_tx_queue(adapter, tx_ring, tx_flags,