aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-04-11 00:04:22 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:25:26 -0400
commitaa8223c7bb0b05183e1737881ed21827aa5b9e73 (patch)
tree05c9832326edfeb878472f15cf8133ed9f014cdf /drivers/net/bnx2.c
parentab6a5bb6b28a970104a34f0f6959b73cf61bdc72 (diff)
[SK_BUFF]: Introduce tcp_hdr(), remove skb->h.th
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r--drivers/net/bnx2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 73512fb16452..7e7b5f344030 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -4524,7 +4524,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
4524 vlan_tag_flags |= TX_BD_FLAGS_SW_LSO; 4524 vlan_tag_flags |= TX_BD_FLAGS_SW_LSO;
4525 4525
4526 tcp_opt_len = 0; 4526 tcp_opt_len = 0;
4527 if (skb->h.th->doff > 5) 4527 if (tcp_hdr(skb)->doff > 5)
4528 tcp_opt_len = tcp_optlen(skb); 4528 tcp_opt_len = tcp_optlen(skb);
4529 4529
4530 ip_tcp_len = ip_hdrlen(skb) + sizeof(struct tcphdr); 4530 ip_tcp_len = ip_hdrlen(skb) + sizeof(struct tcphdr);
@@ -4532,9 +4532,9 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
4532 iph = ip_hdr(skb); 4532 iph = ip_hdr(skb);
4533 iph->check = 0; 4533 iph->check = 0;
4534 iph->tot_len = htons(mss + ip_tcp_len + tcp_opt_len); 4534 iph->tot_len = htons(mss + ip_tcp_len + tcp_opt_len);
4535 skb->h.th->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr, 4535 tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
4536 0, IPPROTO_TCP, 0); 4536 iph->daddr, 0,
4537 4537 IPPROTO_TCP, 0);
4538 if (tcp_opt_len || (iph->ihl > 5)) { 4538 if (tcp_opt_len || (iph->ihl > 5)) {
4539 vlan_tag_flags |= ((iph->ihl - 5) + 4539 vlan_tag_flags |= ((iph->ihl - 5) +
4540 (tcp_opt_len >> 2)) << 8; 4540 (tcp_opt_len >> 2)) << 8;