diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-19 01:43:48 +0100 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 07:25:24 +0200 |
| commit | ab6a5bb6b28a970104a34f0f6959b73cf61bdc72 (patch) | |
| tree | 54cfa7d4fe00d0c28a60022b075afc0856d6fc2b /drivers/net/myri10ge | |
| parent | [SK_BUFF]: Introduce icmp_hdr(), remove skb->h.icmph (diff) | |
| download | linux-ab6a5bb6b28a970104a34f0f6959b73cf61bdc72.tar.xz linux-ab6a5bb6b28a970104a34f0f6959b73cf61bdc72.zip | |
[TCP]: Introduce tcp_hdrlen() and tcp_optlen()
The ip_hdrlen() buddy, created to reduce the number of skb->h.th-> uses and to
avoid the longer, open coded equivalent.
Ditched a no-op in bnx2 in the process.
I wonder if we should have a BUG_ON(skb->h.th->doff < 5) in tcp_optlen()...
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/myri10ge')
| -rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index e04228c7b14f..e4b69a0485ba 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c @@ -2054,8 +2054,7 @@ again: * send loop that we are still in the * header portion of the TSO packet. * TSO header must be at most 134 bytes long */ - cum_len = -(skb_transport_offset(skb) + - (skb->h.th->doff << 2)); + cum_len = -(skb_transport_offset(skb) + tcp_hdrlen(skb)); /* for TSO, pseudo_hdr_offset holds mss. * The firmware figures out where to put |