diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-28 13:24:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-28 13:24:06 -0700 |
| commit | def8b4faff5ca349beafbbfeb2c51f3602a6ef3a (patch) | |
| tree | a90fbb0b6ae2a49c507465801f31df77bc5ebf9d /net/ipv6 | |
| parent | b057efd4d226fcc3a92b0dc6d8ea8e8185ecb260 (diff) | |
| download | blackbird-op-linux-def8b4faff5ca349beafbbfeb2c51f3602a6ef3a.tar.gz blackbird-op-linux-def8b4faff5ca349beafbbfeb2c51f3602a6ef3a.zip | |
net: reduce structures when XFRM=n
ifdef out
* struct sk_buff::sp (pointer)
* struct dst_entry::xfrm (pointer)
* struct sock::sk_policy (2 pointers)
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/icmp.c | 3 | ||||
| -rw-r--r-- | net/ipv6/ip6_output.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 9b7d19ae5ced..508a713ac045 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -646,9 +646,10 @@ static int icmpv6_rcv(struct sk_buff *skb) int type; if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) { + struct sec_path *sp = skb_sec_path(skb); int nh; - if (!(skb->sp && skb->sp->xvec[skb->sp->len - 1]->props.flags & + if (!(sp && sp->xvec[sp->len - 1]->props.flags & XFRM_STATE_ICMP)) goto drop_no_count; diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index c77db0b95e26..7d92fd97cfb9 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -490,7 +490,7 @@ int ip6_forward(struct sk_buff *skb) We don't send redirects to frames decapsulated from IPsec. */ if (skb->dev == dst->dev && dst->neighbour && opt->srcrt == 0 && - !skb->sp) { + !skb_sec_path(skb)) { struct in6_addr *target = NULL; struct rt6_info *rt; struct neighbour *n = dst->neighbour; |
