diff options
author | Ingo Molnar <mingo@kernel.org> | 2021-06-18 11:31:25 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2021-06-18 11:31:25 +0200 |
commit | b2c0931a07b7376c6291e0cfb347ad27f7b66263 (patch) | |
tree | 58ee600a10ecc49f473429a73c6c079422dac97f /net/tls/tls_device_fallback.c | |
parent | 94aafc3ee31dc199d1078ffac9edd976b7f47b3d (diff) | |
parent | a7b359fc6a37faaf472125867c8dc5a068c90982 (diff) | |
download | linux-b2c0931a07b7376c6291e0cfb347ad27f7b66263.tar.bz2 |
Merge branch 'sched/urgent' into sched/core, to resolve conflicts
This commit in sched/urgent moved the cfs_rq_is_decayed() function:
a7b359fc6a37: ("sched/fair: Correctly insert cfs_rq's to list on unthrottle")
and this fresh commit in sched/core modified it in the old location:
9e077b52d86a: ("sched/pelt: Check that *_avg are null when *_sum are")
Merge the two variants.
Conflicts:
kernel/sched/fair.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/tls/tls_device_fallback.c')
-rw-r--r-- | net/tls/tls_device_fallback.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/tls/tls_device_fallback.c b/net/tls/tls_device_fallback.c index cacf040872c7..e40bedd112b6 100644 --- a/net/tls/tls_device_fallback.c +++ b/net/tls/tls_device_fallback.c @@ -431,6 +431,13 @@ struct sk_buff *tls_validate_xmit_skb(struct sock *sk, } EXPORT_SYMBOL_GPL(tls_validate_xmit_skb); +struct sk_buff *tls_validate_xmit_skb_sw(struct sock *sk, + struct net_device *dev, + struct sk_buff *skb) +{ + return tls_sw_fallback(sk, skb); +} + struct sk_buff *tls_encrypt_skb(struct sk_buff *skb) { return tls_sw_fallback(skb->sk, skb); |