Skip to content

Commit 69716a3

Browse files
committed
Revert "xfrm: add SA information to the offloaded packet"
This reverts commit e7cd191. While supporting xfrm interfaces in the packet offload API is needed, this patch does not do the right thing. There are more things to do to really support xfrm interfaces, so revert it for now. Signed-off-by: Steffen Klassert <[email protected]>
1 parent 17163f2 commit 69716a3

File tree

1 file changed

+0
-21
lines changed

1 file changed

+0
-21
lines changed

net/xfrm/xfrm_output.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -706,8 +706,6 @@ int xfrm_output(struct sock *sk, struct sk_buff *skb)
706706
struct xfrm_state *x = skb_dst(skb)->xfrm;
707707
int family;
708708
int err;
709-
struct xfrm_offload *xo;
710-
struct sec_path *sp;
711709

712710
family = (x->xso.type != XFRM_DEV_OFFLOAD_PACKET) ? x->outer_mode.family
713711
: skb_dst(skb)->ops->family;
@@ -730,25 +728,6 @@ int xfrm_output(struct sock *sk, struct sk_buff *skb)
730728
kfree_skb(skb);
731729
return -EHOSTUNREACH;
732730
}
733-
sp = secpath_set(skb);
734-
if (!sp) {
735-
XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTERROR);
736-
kfree_skb(skb);
737-
return -ENOMEM;
738-
}
739-
740-
sp->olen++;
741-
sp->xvec[sp->len++] = x;
742-
xfrm_state_hold(x);
743-
744-
xo = xfrm_offload(skb);
745-
if (!xo) {
746-
secpath_reset(skb);
747-
XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTERROR);
748-
kfree_skb(skb);
749-
return -EINVAL;
750-
}
751-
xo->flags |= XFRM_XMIT;
752731

753732
return xfrm_output_resume(sk, skb, 0);
754733
}

0 commit comments

Comments
 (0)