[PATCH 09/10] Revert "esp: do not unref managed frag pages in esp_ssg_unref()"
Steffen Klassert <[email protected]>
| Newsgroups | gmane.linux.network |
|---|---|
| Message-ID | <[email protected]> |
This reverts commit 21697720ff43b8dfa25b8e8d9ca7f56f4597fc80. The patch does not fix the issue completely, so revert for now and wait for an updated version. Signed-off-by: Steffen Klassert <[email protected]> --- net/ipv4/esp4.c | 7 ------- net/ipv6/esp6.c | 7 ------- 2 files changed, 14 deletions(-) diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index fa1710e27e50..dfc81ee969ae 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -104,13 +104,6 @@ static void esp_ssg_unref(struct xfrm_state *x, void *tmp, struct sk_buff *skb, struct aead_request *req; struct scatterlist *sg; - /* Managed frags are owned by the zerocopy ubuf; the skb holds no - * per-frag page reference, so we must not drop one here. Mirrors - * the SKBFL_MANAGED_FRAG_REFS handling in skb_release_data(). - */ - if (skb_zcopy_managed(skb)) - return; - if (x->props.flags & XFRM_STATE_ESN) extralen += sizeof(struct esp_output_extra); diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index 7d216b9c59f0..296b57926abb 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -121,13 +121,6 @@ static void esp_ssg_unref(struct xfrm_state *x, void *tmp, struct sk_buff *skb, struct aead_request *req; struct scatterlist *sg; - /* Managed frags are owned by the zerocopy ubuf; the skb holds no - * per-frag page reference, so we must not drop one here. Mirrors - * the SKBFL_MANAGED_FRAG_REFS handling in skb_release_data(). - */ - if (skb_zcopy_managed(skb)) - return; - if (x->props.flags & XFRM_STATE_ESN) extralen += sizeof(struct esp_output_extra); -- 2.43.0