diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-16 16:26:39 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:26:19 -0400 |
commit | cfe1fc7759fdacb0c650b575daed1692bf3eaece (patch) | |
tree | b8ed6fbc6c028595f5e82be1bccdeb2727e0a0b2 /net/ipv6/esp6.c | |
parent | bff9b61ce330df04c6830d823c30c04203543f01 (diff) |
[SK_BUFF]: Introduce skb_network_header_len
For the common sequence "skb->h.raw - skb->nh.raw", similar to skb->mac_len,
that is precalculated tho, don't think we need to bloat skb with one more
member, so just use this new helper, reducing the number of non-skbuff.h
references to the layer headers even more.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/esp6.c')
-rw-r--r-- | net/ipv6/esp6.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index 436eb9e6a6cf..7fdf84dee73f 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c | |||
@@ -147,8 +147,7 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb) | |||
147 | int blksize = ALIGN(crypto_blkcipher_blocksize(tfm), 4); | 147 | int blksize = ALIGN(crypto_blkcipher_blocksize(tfm), 4); |
148 | int alen = esp->auth.icv_trunc_len; | 148 | int alen = esp->auth.icv_trunc_len; |
149 | int elen = skb->len - sizeof(struct ipv6_esp_hdr) - esp->conf.ivlen - alen; | 149 | int elen = skb->len - sizeof(struct ipv6_esp_hdr) - esp->conf.ivlen - alen; |
150 | 150 | int hdr_len = skb_network_header_len(skb); | |
151 | int hdr_len = skb->h.raw - skb->nh.raw; | ||
152 | int nfrags; | 151 | int nfrags; |
153 | int ret = 0; | 152 | int ret = 0; |
154 | 153 | ||