diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-09 15:26:24 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-09 15:26:24 -0400 |
| commit | d5531d8afe3508059ac2953585d395d419e300ff (patch) | |
| tree | b5a39e92e83d6f3d2737fd29dc6baf59f6a32437 | |
| parent | 9da522e4da45c654b942856ee9a1a33454786106 (diff) | |
| download | longterm-queue-4.18-d5531d8afe3508059ac2953585d395d419e300ff.tar.gz | |
net/tls: no TLS_RX flag used in 4.18
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/net-tls-don-t-ignore-netdev-notifications-if-no-TLS-.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/queue/net-tls-don-t-ignore-netdev-notifications-if-no-TLS-.patch b/queue/net-tls-don-t-ignore-netdev-notifications-if-no-TLS-.patch index 751bbb3..833d7d1 100644 --- a/queue/net-tls-don-t-ignore-netdev-notifications-if-no-TLS-.patch +++ b/queue/net-tls-don-t-ignore-netdev-notifications-if-no-TLS-.patch @@ -1,4 +1,4 @@ -From c3f4a6c39cf269a40d45f813c05fa830318ad875 Mon Sep 17 00:00:00 2001 +From c8edc1f27c7170a57d1ecd5ae52c767fa729e835 Mon Sep 17 00:00:00 2001 From: Jakub Kicinski <jakub.kicinski@netronome.com> Date: Tue, 21 May 2019 19:02:02 -0700 Subject: [PATCH] net/tls: don't ignore netdev notifications if no TLS features @@ -18,19 +18,19 @@ Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com> Signed-off-by: David S. Miller <davem@davemloft.net> diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c -index 07650446e892..b95c408fd771 100644 +index 9bd0286d5407..178a15c27628 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c -@@ -997,7 +997,8 @@ static int tls_dev_event(struct notifier_block *this, unsigned long event, +@@ -732,7 +732,8 @@ static int tls_dev_event(struct notifier_block *this, unsigned long event, { struct net_device *dev = netdev_notifier_info_to_dev(ptr); -- if (!(dev->features & (NETIF_F_HW_TLS_RX | NETIF_F_HW_TLS_TX))) +- if (!(dev->features & NETIF_F_HW_TLS_TX)) + if (!dev->tlsdev_ops && -+ !(dev->features & (NETIF_F_HW_TLS_RX | NETIF_F_HW_TLS_TX))) ++ !(dev->features & NETIF_F_HW_TLS_TX)) return NOTIFY_DONE; switch (event) { -- -2.9.5 +2.7.4 |