diff --git a/drivers/net/enic/enic_compat.h b/drivers/net/enic/enic_compat.h index eb1fc941e4..7741273037 100644 --- a/drivers/net/enic/enic_compat.h +++ b/drivers/net/enic/enic_compat.h @@ -73,14 +73,4 @@ static inline void writel(unsigned int val, volatile void __iomem *addr) rte_write32(val, addr); } -#define min_t(type, x, y) ({ \ - type __min1 = (x); \ - type __min2 = (y); \ - __min1 < __min2 ? __min1 : __min2; }) - -#define max_t(type, x, y) ({ \ - type __max1 = (x); \ - type __max2 = (y); \ - __max1 > __max2 ? __max1 : __max2; }) - #endif /* _ENIC_COMPAT_H_ */ diff --git a/drivers/net/enic/enic_res.h b/drivers/net/enic/enic_res.h index 9700b0d3e6..b3bd4b27d3 100644 --- a/drivers/net/enic/enic_res.h +++ b/drivers/net/enic/enic_res.h @@ -11,6 +11,16 @@ #include "vnic_wq.h" #include "vnic_rq.h" +#define min_t(type, x, y) ({ \ + type __min1 = (x); \ + type __min2 = (y); \ + __min1 < __min2 ? __min1 : __min2; }) + +#define max_t(type, x, y) ({ \ + type __max1 = (x); \ + type __max2 = (y); \ + __max1 > __max2 ? __max1 : __max2; }) + #define ENIC_MIN_WQ_DESCS 64 #define ENIC_MAX_WQ_DESCS 4096 #define ENIC_MIN_RQ_DESCS 64 @@ -55,7 +65,6 @@ #define ENIC_SETTING(enic, f) ((enic->config.flags & VENETF_##f) ? 1 : 0) - struct enic; int enic_get_vnic_config(struct enic *);