forked from luck/tmp_suning_uos_patched
[IPSEC]: Move RO-specific output code into xfrm6_mode_ro.c
The lastused update check in xfrm_output can be done just as well in the mode output function which is specific to RO. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
cdf7e668d4
commit
45b17f48ea
|
@ -29,6 +29,7 @@
|
|||
#include <linux/module.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/stringify.h>
|
||||
#include <linux/time.h>
|
||||
#include <net/ipv6.h>
|
||||
#include <net/xfrm.h>
|
||||
|
||||
|
@ -57,6 +58,9 @@ static int xfrm6_ro_output(struct xfrm_state *x, struct sk_buff *skb)
|
|||
(prevhdr - x->props.header_len) - skb->data);
|
||||
skb_set_transport_header(skb, hdr_len);
|
||||
memmove(skb->data, iph, hdr_len);
|
||||
|
||||
x->lastused = get_seconds();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
#include <linux/netdevice.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/time.h>
|
||||
#include <net/dst.h>
|
||||
#include <net/xfrm.h>
|
||||
|
||||
|
@ -75,9 +74,6 @@ int xfrm_output(struct sk_buff *skb)
|
|||
x->curlft.bytes += skb->len;
|
||||
x->curlft.packets++;
|
||||
|
||||
if (x->props.mode == XFRM_MODE_ROUTEOPTIMIZATION)
|
||||
x->lastused = get_seconds();
|
||||
|
||||
spin_unlock_bh(&x->lock);
|
||||
|
||||
skb_reset_network_header(skb);
|
||||
|
|
Loading…
Reference in New Issue
Block a user