forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SK_BUFF]: Introduce tcp_hdr(), remove skb->h.th

Browse source 
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnaldo Carvalho de Melo 2007-04-10 21:04:22 -07:00 • committed by David S. Miller
parent ab6a5bb6b2
commit aa8223c7bb
23 changed files with 134 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/linux/skbuff.h
View file

@ -237,7 +237,6 @@ struct sk_buff {
/* 4 byte hole on 64 bit*/
union {
struct tcphdr *th;
struct iphdr *ipiph;
struct ipv6hdr *ipv6h;
unsigned char *raw;

9
include/linux/tcp.h
View file

@ -178,14 +178,19 @@ struct tcp_md5sig {
#include <net/inet_connection_sock.h>
#include <net/inet_timewait_sock.h>
static inline struct tcphdr *tcp_hdr(const struct sk_buff *skb)
{
return (struct tcphdr *)skb->h.raw;
}
static inline unsigned int tcp_hdrlen(const struct sk_buff *skb)
{
return skb->h.th->doff * 4;
return tcp_hdr(skb)->doff * 4;
}
static inline unsigned int tcp_optlen(const struct sk_buff *skb)
{
return (skb->h.th->doff - 5) * 4;
return (tcp_hdr(skb)->doff - 5) * 4;
}
/* This defines a selective acknowledgement block. */