projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bnx2x: add support for receive hashing
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
bnx2x.h
diff --git
a/drivers/net/bnx2x.h
b/drivers/net/bnx2x.h
index bdfe084b8abeefb19a1b2851d0ce0c1b899abb90..8bd23687c530f2e244c7050091d14c05b8fa7901 100644
(file)
--- a/
drivers/net/bnx2x.h
+++ b/
drivers/net/bnx2x.h
@@
-24,16
+24,25
@@
#define BCM_VLAN 1
#endif
#define BCM_VLAN 1
#endif
+#define BNX2X_MULTI_QUEUE
+
+#define BNX2X_NEW_NAPI
+
+
+
#if defined(CONFIG_CNIC) || defined(CONFIG_CNIC_MODULE)
#define BCM_CNIC 1
#include "cnic_if.h"
#endif
#if defined(CONFIG_CNIC) || defined(CONFIG_CNIC_MODULE)
#define BCM_CNIC 1
#include "cnic_if.h"
#endif
-#define BNX2X_MULTI_QUEUE
-
-#define BNX2X_NEW_NAPI
-
+#ifdef BCM_CNIC
+#define BNX2X_MIN_MSIX_VEC_CNT 3
+#define BNX2X_MSIX_VEC_FP_START 2
+#else
+#define BNX2X_MIN_MSIX_VEC_CNT 2
+#define BNX2X_MSIX_VEC_FP_START 1
+#endif
#include <linux/mdio.h>
#include "bnx2x_reg.h"
#include <linux/mdio.h>
#include "bnx2x_reg.h"
@@
-272,7
+281,7
@@
struct bnx2x_eth_q_stats {
u32 hw_csum_err;
};
u32 hw_csum_err;
};
-#define BNX2X_NUM_Q_STATS 1
1
+#define BNX2X_NUM_Q_STATS 1
3
#define Q_STATS_OFFSET32(stat_name) \
(offsetof(struct bnx2x_eth_q_stats, stat_name) / 4)
#define Q_STATS_OFFSET32(stat_name) \
(offsetof(struct bnx2x_eth_q_stats, stat_name) / 4)
@@
-778,7
+787,7
@@
struct bnx2x_eth_stats {
u32 nig_timer_max;
};
u32 nig_timer_max;
};
-#define BNX2X_NUM_STATS 4
1
+#define BNX2X_NUM_STATS 4
3
#define STATS_OFFSET32(stat_name) \
(offsetof(struct bnx2x_eth_stats, stat_name) / 4)
#define STATS_OFFSET32(stat_name) \
(offsetof(struct bnx2x_eth_stats, stat_name) / 4)
@@
-862,7
+871,6
@@
struct bnx2x {
#endif
#define INT_MODE_INTx 1
#define INT_MODE_MSI 2
#endif
#define INT_MODE_INTx 1
#define INT_MODE_MSI 2
-#define INT_MODE_MSIX 3
int tx_ring_size;
int tx_ring_size;
@@
-1322,7
+1330,7
@@
static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY | \
AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY)
AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY | \
AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY)
-#define
MULTI
_FLAGS(bp) \
+#define
RSS
_FLAGS(bp) \
(TSTORM_ETH_FUNCTION_COMMON_CONFIG_RSS_IPV4_CAPABILITY | \
TSTORM_ETH_FUNCTION_COMMON_CONFIG_RSS_IPV4_TCP_CAPABILITY | \
TSTORM_ETH_FUNCTION_COMMON_CONFIG_RSS_IPV6_CAPABILITY | \
(TSTORM_ETH_FUNCTION_COMMON_CONFIG_RSS_IPV4_CAPABILITY | \
TSTORM_ETH_FUNCTION_COMMON_CONFIG_RSS_IPV4_TCP_CAPABILITY | \
TSTORM_ETH_FUNCTION_COMMON_CONFIG_RSS_IPV6_CAPABILITY | \