diff options
| author | Alexey Dobriyan | 2006-05-23 23:52:21 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2006-05-27 03:29:09 +0200 |
| commit | 6082823632e40737515d03381e1ba59cfb4d4909 (patch) | |
| tree | be9f17d81216d3fdf3cbd5ce659c43d523876eb8 /drivers/net/e1000/e1000_main.c | |
| parent | Merge branch 'upstream-fixes' into upstream (diff) | |
| download | kernel-qcow2-linux-6082823632e40737515d03381e1ba59cfb4d4909.tar.gz kernel-qcow2-linux-6082823632e40737515d03381e1ba59cfb4d4909.tar.xz kernel-qcow2-linux-6082823632e40737515d03381e1ba59cfb4d4909.zip | |
[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>
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 4 |
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, hdr_len = ((skb->h.raw - skb->data) + (skb->h.th->doff << 2)); mss = skb_shinfo(skb)->tso_size; - if (skb->protocol == ntohs(ETH_P_IP)) { + if (skb->protocol == htons(ETH_P_IP)) { skb->nh.iph->tot_len = 0; skb->nh.iph->check = 0; skb->h.th->check = @@ -2871,7 +2871,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) /* Old method was to assume IPv4 packet by default if TSO was enabled. * 82571 hardware supports TSO capabilities for IPv6 as well... * no longer assume, we must. */ - if (likely(skb->protocol == ntohs(ETH_P_IP))) + if (likely(skb->protocol == htons(ETH_P_IP))) tx_flags |= E1000_TX_FLAGS_IPV4; e1000_tx_queue(adapter, tx_ring, tx_flags, |