From: Ophir Munk <ophirmu@mellanox.com> Remove unused Linux included files: <sys/ioctl.h>, <arpa/inet.h> from file net/mlx5/mlx5_mac.c <sys/mman.h> from file net/mlx5/mlx5.c Fixes: 771fa900b73a ("mlx5: introduce new driver for Mellanox ConnectX-4 adapters") Cc: stable@dpdk.org Signed-off-by: Ophir Munk <ophirmu@mellanox.com> Acked-by: Matan Azrad <matan@mellanox.com> --- drivers/net/mlx5/mlx5.c | 1 - drivers/net/mlx5/mlx5_mac.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index b099b23..ca60926 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -9,7 +9,6 @@ #include <stdint.h> #include <stdlib.h> #include <errno.h> -#include <sys/mman.h> #include <linux/rtnetlink.h> #include <rte_malloc.h> diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c index 88c52b2..bd786fd 100644 --- a/drivers/net/mlx5/mlx5_mac.c +++ b/drivers/net/mlx5/mlx5_mac.c @@ -9,8 +9,6 @@ #include <inttypes.h> #include <errno.h> #include <netinet/in.h> -#include <sys/ioctl.h> -#include <arpa/inet.h> #include <rte_ether.h> #include <rte_ethdev_driver.h> -- 2.8.4
From: Ophir Munk <ophirmu@mellanox.com> Remove utility macros INFO, WARN, ERROR. They are not in use and conflict with identical definitions when compiled under Windows. Fixes: 80f2d0ed7ff9 ("net/mlx5: add hardware flow debug dump") Cc: stable@dpdk.org Signed-off-by: Ophir Munk <ophirmu@mellanox.com> Acked-by: Matan Azrad <matan@mellanox.com> --- drivers/net/mlx5/mlx5_utils.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_utils.h b/drivers/net/mlx5/mlx5_utils.h index 97d931f..f078bdc 100644 --- a/drivers/net/mlx5/mlx5_utils.h +++ b/drivers/net/mlx5/mlx5_utils.h @@ -35,10 +35,6 @@ extern int mlx5_logtype; __VA_ARGS__ PMD_DRV_LOG_STRIP PMD_DRV_LOG_OPAREN, \ PMD_DRV_LOG_CPAREN) -#define INFO(...) DRV_LOG(INFO, __VA_ARGS__) -#define WARN(...) DRV_LOG(WARNING, __VA_ARGS__) -#define ERROR(...) DRV_LOG(ERR, __VA_ARGS__) - /* Convenience macros for accessing mbuf fields. */ #define NEXT(m) ((m)->next) #define DATA_LEN(m) ((m)->data_len) -- 2.8.4
From: Ophir Munk <ophirmu@mellanox.com> Remove unused Linux included files: <sys/ioctl.h>, <arpa/inet.h> from file net/mlx5/mlx5_mac.c <sys/mman.h> from file net/mlx5/mlx5.c Fixes: 771fa900b73a ("mlx5: introduce new driver for Mellanox ConnectX-4 adapters") Cc: stable@dpdk.org Signed-off-by: Ophir Munk <ophirmu@mellanox.com> Acked-by: Matan Azrad <matan@mellanox.com> --- drivers/net/mlx5/mlx5.c | 1 - drivers/net/mlx5/mlx5_mac.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index b099b23..ca60926 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -9,7 +9,6 @@ #include <stdint.h> #include <stdlib.h> #include <errno.h> -#include <sys/mman.h> #include <linux/rtnetlink.h> #include <rte_malloc.h> diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c index 88c52b2..bd786fd 100644 --- a/drivers/net/mlx5/mlx5_mac.c +++ b/drivers/net/mlx5/mlx5_mac.c @@ -9,8 +9,6 @@ #include <inttypes.h> #include <errno.h> #include <netinet/in.h> -#include <sys/ioctl.h> -#include <arpa/inet.h> #include <rte_ether.h> #include <rte_ethdev_driver.h> -- 2.8.4
From: Ophir Munk <ophirmu@mellanox.com> Remove utility macros INFO, WARN, ERROR. They are not in use and conflict with identical definitions when compiled under Windows. Fixes: 80f2d0ed7ff9 ("net/mlx5: add hardware flow debug dump") Cc: stable@dpdk.org Signed-off-by: Ophir Munk <ophirmu@mellanox.com> Acked-by: Matan Azrad <matan@mellanox.com> --- drivers/net/mlx5/mlx5_utils.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_utils.h b/drivers/net/mlx5/mlx5_utils.h index 97d931f..f078bdc 100644 --- a/drivers/net/mlx5/mlx5_utils.h +++ b/drivers/net/mlx5/mlx5_utils.h @@ -35,10 +35,6 @@ extern int mlx5_logtype; __VA_ARGS__ PMD_DRV_LOG_STRIP PMD_DRV_LOG_OPAREN, \ PMD_DRV_LOG_CPAREN) -#define INFO(...) DRV_LOG(INFO, __VA_ARGS__) -#define WARN(...) DRV_LOG(WARNING, __VA_ARGS__) -#define ERROR(...) DRV_LOG(ERR, __VA_ARGS__) - /* Convenience macros for accessing mbuf fields. */ #define NEXT(m) ((m)->next) #define DATA_LEN(m) ((m)->data_len) -- 2.8.4