diff options
| author | Florian Westphal <fw@strlen.de> | 2020-05-16 10:46:23 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-17 12:35:34 -0700 |
| commit | 4930f4831b1547b52c5968e9307fe3d840d7fba0 (patch) | |
| tree | 11c8520bff5181c4954df61a7082f12f441f0867 /net/mptcp | |
| parent | 5c8264435d4f6a056ac926989a827aba1961e3c8 (diff) | |
| download | linux-4930f4831b1547b52c5968e9307fe3d840d7fba0.tar.gz linux-4930f4831b1547b52c5968e9307fe3d840d7fba0.tar.bz2 linux-4930f4831b1547b52c5968e9307fe3d840d7fba0.zip | |
net: allow __skb_ext_alloc to sleep
mptcp calls this from the transmit side, from process context.
Allow a sleeping allocation instead of unconditional GFP_ATOMIC.
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp')
| -rw-r--r-- | net/mptcp/protocol.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index bc950cf818f7..e3a628bea2b8 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -367,8 +367,10 @@ static void mptcp_stop_timer(struct sock *sk) static bool mptcp_ext_cache_refill(struct mptcp_sock *msk) { + const struct sock *sk = (const struct sock *)msk; + if (!msk->cached_ext) - msk->cached_ext = __skb_ext_alloc(); + msk->cached_ext = __skb_ext_alloc(sk->sk_allocation); return !!msk->cached_ext; } |