| --- a/net/xfrm/xfrm_output.c |
| +++ b/net/xfrm/xfrm_output.c |
| @@ -410,7 +410,7 @@ static int xfrm_output_one(struct sk_buf |
| struct xfrm_state *x = dst->xfrm; |
| struct net *net = xs_net(x); |
| |
| - if (err <= 0 || x->xso.type == XFRM_DEV_OFFLOAD_PACKET) |
| + if (err <= 0) |
| goto resume; |
| |
| do { |
| @@ -568,16 +568,6 @@ int xfrm_output(struct sock *sk, struct |
| struct xfrm_state *x = skb_dst(skb)->xfrm; |
| int err; |
| |
| - if (x->xso.type == XFRM_DEV_OFFLOAD_PACKET) { |
| - if (!xfrm_dev_offload_ok(skb, x)) { |
| - XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTERROR); |
| - kfree_skb(skb); |
| - return -EHOSTUNREACH; |
| - } |
| - |
| - return xfrm_output_resume(skb, 0); |
| - } |
| - |
| secpath_reset(skb); |
| |
| if (xfrm_dev_offload_ok(skb, x)) { |