Home Home > GIT Browse > SLE12-SP3-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Koutný <mkoutny@suse.com>2019-01-11 23:09:39 +0100
committerMichal Koutný <mkoutny@suse.com>2019-01-14 19:22:07 +0100
commitae94ec19572120b2c173245f717b2ed4ab5815ba (patch)
treec20b909e8e43fe710b0d7fa7f86bafc714d685b3
parentc0a4b5490f62e46b46b20291b80e78592a3af7af (diff)
Refresh patches.drivers/mlx4-0006-mlx5-add-busy-polling-support.patch (bsc#1114763).
Restore linux/prefetch.h being removed by an unrelated patch.
-rw-r--r--patches.drivers/mlx4-0006-mlx5-add-busy-polling-support.patch5
-rw-r--r--patches.drivers/mlx5-0159-net-mlx5e-Support-offload-cls_flower-with-skbedit-ma.patch2
2 files changed, 3 insertions, 4 deletions
diff --git a/patches.drivers/mlx4-0006-mlx5-add-busy-polling-support.patch b/patches.drivers/mlx4-0006-mlx5-add-busy-polling-support.patch
index 67eee7c19f..65a6aa0cd6 100644
--- a/patches.drivers/mlx4-0006-mlx5-add-busy-polling-support.patch
+++ b/patches.drivers/mlx4-0006-mlx5-add-busy-polling-support.patch
@@ -86,11 +86,10 @@ Acked-by: Benjamin Poirier <bpoirier@suse.com>
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
-@@ -33,7 +33,7 @@
- #include <linux/ip.h>
+@@ -33,6 +33,7 @@
#include <linux/ipv6.h>
#include <linux/tcp.h>
--#include <linux/prefetch.h>
+ #include <linux/prefetch.h>
+#include <net/busy_poll.h>
#include "en.h"
diff --git a/patches.drivers/mlx5-0159-net-mlx5e-Support-offload-cls_flower-with-skbedit-ma.patch b/patches.drivers/mlx5-0159-net-mlx5e-Support-offload-cls_flower-with-skbedit-ma.patch
index cba595ff67..bb8d91a33d 100644
--- a/patches.drivers/mlx5-0159-net-mlx5e-Support-offload-cls_flower-with-skbedit-ma.patch
+++ b/patches.drivers/mlx5-0159-net-mlx5e-Support-offload-cls_flower-with-skbedit-ma.patch
@@ -29,7 +29,7 @@ Acked-by: Benjamin Poirier <bpoirier@suse.com>
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@ -35,6 +35,7 @@
- #include <linux/tcp.h>
+ #include <linux/prefetch.h>
#include <net/busy_poll.h>
#include "en.h"
+#include "en_tc.h"