diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-25 20:55:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:25:16 -0400 |
| commit | ea2ae17d6443abddc79480dc9f7af8feacabddc4 (patch) | |
| tree | 2d6f48a5e4a40f761b5b510af9aac1fca55004cb /net/ipv6/ipcomp6.c | |
| parent | badff6d01a8589a1c828b0bf118903ca38627f4e (diff) | |
[SK_BUFF]: Introduce skb_transport_offset()
For the quite common 'skb->h.raw - skb->data' sequence.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ipcomp6.c')
| -rw-r--r-- | net/ipv6/ipcomp6.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c index e2404a629680..4a6501695e98 100644 --- a/net/ipv6/ipcomp6.c +++ b/net/ipv6/ipcomp6.c | |||
| @@ -124,15 +124,13 @@ static int ipcomp6_output(struct xfrm_state *x, struct sk_buff *skb) | |||
| 124 | { | 124 | { |
| 125 | int err; | 125 | int err; |
| 126 | struct ipv6hdr *top_iph; | 126 | struct ipv6hdr *top_iph; |
| 127 | int hdr_len; | ||
| 128 | struct ipv6_comp_hdr *ipch; | 127 | struct ipv6_comp_hdr *ipch; |
| 129 | struct ipcomp_data *ipcd = x->data; | 128 | struct ipcomp_data *ipcd = x->data; |
| 130 | int plen, dlen; | 129 | int plen, dlen; |
| 131 | u8 *start, *scratch; | 130 | u8 *start, *scratch; |
| 132 | struct crypto_comp *tfm; | 131 | struct crypto_comp *tfm; |
| 133 | int cpu; | 132 | int cpu; |
| 134 | 133 | int hdr_len = skb_transport_offset(skb); | |
| 135 | hdr_len = skb->h.raw - skb->data; | ||
| 136 | 134 | ||
| 137 | /* check whether datagram len is larger than threshold */ | 135 | /* check whether datagram len is larger than threshold */ |
| 138 | if ((skb->len - hdr_len) < ipcd->threshold) { | 136 | if ((skb->len - hdr_len) < ipcd->threshold) { |