From 3303601acfde846b1626268ab9f09155b7446d46 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Thu, 26 Jul 2018 14:03:15 -0500 Subject: [PATCH] mlxfs: Fixed compilation warning Signed-off-by: Vladimir Sokolovsky --- patches/0017-BACKPORT-mlxfw.patch | 52 +++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 patches/0017-BACKPORT-mlxfw.patch diff --git a/patches/0017-BACKPORT-mlxfw.patch b/patches/0017-BACKPORT-mlxfw.patch new file mode 100644 index 0000000..c8d90ff --- /dev/null +++ b/patches/0017-BACKPORT-mlxfw.patch @@ -0,0 +1,52 @@ +From: Vladimir Sokolovsky +Subject: [PATCH] BACKPORT: mlxfw + +Signed-off-by: Vladimir Sokolovsky +--- + drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c | 3 +++ + drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c | 3 +++ + drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c | 3 +++ + 3 files changed, 9 insertions(+) + +diff --git a/drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c b/drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c +index xxxxxxx..xxxxxxx xxxxxx +--- a/drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c ++++ b/drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c +@@ -32,6 +32,9 @@ + * POSSIBILITY OF SUCH DAMAGE. + */ + ++#ifdef pr_fmt ++#undef pr_fmt ++#endif + #define pr_fmt(fmt) "mlxfw: " fmt + + #include +diff --git a/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c b/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c +index xxxxxxx..xxxxxxx xxxxxx +--- a/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c ++++ b/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c +@@ -32,6 +32,9 @@ + * POSSIBILITY OF SUCH DAMAGE. + */ + ++#ifdef pr_fmt ++#undef pr_fmt ++#endif + #define pr_fmt(fmt) "mlxfw_mfa2: " fmt + + #include +diff --git a/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c b/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c +index xxxxxxx..xxxxxxx xxxxxx +--- a/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c ++++ b/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c +@@ -32,6 +32,9 @@ + * POSSIBILITY OF SUCH DAMAGE. + */ + ++#ifdef pr_fmt ++#undef pr_fmt ++#endif + #define pr_fmt(fmt) "MFA2: " fmt + + #include "mlxfw_mfa2_tlv_multi.h" -- 2.46.0