|
@@ -54,7 +54,7 @@
|
|
|
|
|
|
#include <net/busy_poll.h>
|
|
|
|
|
|
-#ifdef CONFIG_NET_LL_RX_POLL
|
|
|
+#ifdef CONFIG_NET_RX_BUSY_POLL
|
|
|
#define LL_EXTENDED_STATS
|
|
|
#endif
|
|
|
/* common prefix used by pr_<> macros */
|
|
@@ -366,7 +366,7 @@ struct ixgbe_q_vector {
|
|
|
struct rcu_head rcu; /* to avoid race with update stats on free */
|
|
|
char name[IFNAMSIZ + 9];
|
|
|
|
|
|
-#ifdef CONFIG_NET_LL_RX_POLL
|
|
|
+#ifdef CONFIG_NET_RX_BUSY_POLL
|
|
|
unsigned int state;
|
|
|
#define IXGBE_QV_STATE_IDLE 0
|
|
|
#define IXGBE_QV_STATE_NAPI 1 /* NAPI owns this QV */
|
|
@@ -377,12 +377,12 @@ struct ixgbe_q_vector {
|
|
|
#define IXGBE_QV_YIELD (IXGBE_QV_STATE_NAPI_YIELD | IXGBE_QV_STATE_POLL_YIELD)
|
|
|
#define IXGBE_QV_USER_PEND (IXGBE_QV_STATE_POLL | IXGBE_QV_STATE_POLL_YIELD)
|
|
|
spinlock_t lock;
|
|
|
-#endif /* CONFIG_NET_LL_RX_POLL */
|
|
|
+#endif /* CONFIG_NET_RX_BUSY_POLL */
|
|
|
|
|
|
/* for dynamic allocation of rings associated with this q_vector */
|
|
|
struct ixgbe_ring ring[0] ____cacheline_internodealigned_in_smp;
|
|
|
};
|
|
|
-#ifdef CONFIG_NET_LL_RX_POLL
|
|
|
+#ifdef CONFIG_NET_RX_BUSY_POLL
|
|
|
static inline void ixgbe_qv_init_lock(struct ixgbe_q_vector *q_vector)
|
|
|
{
|
|
|
|
|
@@ -462,7 +462,7 @@ static inline bool ixgbe_qv_ll_polling(struct ixgbe_q_vector *q_vector)
|
|
|
WARN_ON(!(q_vector->state & IXGBE_QV_LOCKED));
|
|
|
return q_vector->state & IXGBE_QV_USER_PEND;
|
|
|
}
|
|
|
-#else /* CONFIG_NET_LL_RX_POLL */
|
|
|
+#else /* CONFIG_NET_RX_BUSY_POLL */
|
|
|
static inline void ixgbe_qv_init_lock(struct ixgbe_q_vector *q_vector)
|
|
|
{
|
|
|
}
|
|
@@ -491,7 +491,7 @@ static inline bool ixgbe_qv_ll_polling(struct ixgbe_q_vector *q_vector)
|
|
|
{
|
|
|
return false;
|
|
|
}
|
|
|
-#endif /* CONFIG_NET_LL_RX_POLL */
|
|
|
+#endif /* CONFIG_NET_RX_BUSY_POLL */
|
|
|
|
|
|
#ifdef CONFIG_IXGBE_HWMON
|
|
|
|