From 2be5c6bd355abb7eea1c42ae8527c80319c6f4ea Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Sun, 11 Jun 2006 20:57:17 -0700 Subject: [PATCH] --- yaml --- r: 27569 b: refs/heads/master c: d1e100ba69131bb788e89a07b94b08f6e006725a h: refs/heads/master i: 27567: 8cc3544335780a48d39776492d5511eadb27644b v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 68ce36c70276..c3337972ff08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ef80aef118e405f2b6505f623830e6e73224f85 +refs/heads/master: d1e100ba69131bb788e89a07b94b08f6e006725a diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c index 9c5a8842ed0f..7a1fb52d5cba 100644 --- a/trunk/drivers/net/bnx2.c +++ b/trunk/drivers/net/bnx2.c @@ -1820,7 +1820,7 @@ bnx2_rx_int(struct bnx2 *bp, int budget) skb->protocol = eth_type_trans(skb, bp->dev); if ((len > (bp->dev->mtu + ETH_HLEN)) && - (htons(skb->protocol) != 0x8100)) { + (ntohs(skb->protocol) != 0x8100)) { dev_kfree_skb_irq(skb); goto next_rx; @@ -4310,7 +4310,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev) ip_tcp_len = (skb->nh.iph->ihl << 2) + sizeof(struct tcphdr); skb->nh.iph->check = 0; - skb->nh.iph->tot_len = ntohs(mss + ip_tcp_len + tcp_opt_len); + skb->nh.iph->tot_len = htons(mss + ip_tcp_len + tcp_opt_len); skb->h.th->check = ~csum_tcpudp_magic(skb->nh.iph->saddr, skb->nh.iph->daddr,