Page MenuHomeFreeBSD
Files F136165864

D11414.id30714.diff
No OneTemporary
Actions

D11414.id30714.diff
View Options

Index: sys/dev/ixl/i40e_prototype.h
===================================================================
--- sys/dev/ixl/i40e_prototype.h
+++ sys/dev/ixl/i40e_prototype.h
@@ -538,6 +538,4 @@
enum i40e_status_code i40e_write_phy_register(struct i40e_hw *hw,
u8 page, u16 reg, u8 phy_addr, u16 value);
u8 i40e_get_phy_address(struct i40e_hw *hw, u8 dev_num);
-enum i40e_status_code i40e_blink_phy_link_led(struct i40e_hw *hw,
- u32 time, u32 interval);
#endif /* _I40E_PROTOTYPE_H_ */
Index: sys/dev/ixl/if_ixlv.c
===================================================================
--- sys/dev/ixl/if_ixlv.c
+++ sys/dev/ixl/if_ixlv.c
@@ -1074,7 +1074,7 @@
if (error == ETIMEDOUT) {
if (!send_api_ver_retried) {
/* Resend message, one more time */
- send_api_ver_retried++;
+ send_api_ver_retried = true;
device_printf(dev,
"%s: Timeout while verifying API version on first"
" try!\n", __func__);
Index: sys/dev/ixl/ixl.h
===================================================================
--- sys/dev/ixl/ixl.h
+++ sys/dev/ixl/ixl.h
@@ -664,8 +664,7 @@
char *description;
};
-static uint8_t ixl_bcast_addr[ETHER_ADDR_LEN] =
- {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+extern const uint8_t ixl_bcast_addr[ETHER_ADDR_LEN];
/*********************************************************************
* TXRX Function prototypes
Index: sys/dev/ixl/ixl_pf.h
===================================================================
--- sys/dev/ixl/ixl_pf.h
+++ sys/dev/ixl/ixl_pf.h
@@ -168,16 +168,9 @@
"\nExecutes a \"Get Link Status\" command on the Admin Queue, and displays" \
" the response." \
-static char *ixl_fc_string[6] = {
- "None",
- "Rx",
- "Tx",
- "Full",
- "Priority",
- "Default"
-};
+extern const char * const ixl_fc_string[6];
-static MALLOC_DEFINE(M_IXL, "ixl", "ixl driver allocations");
+MALLOC_DECLARE(M_IXL);
/*** Functions / Macros ***/
/* Adjust the level here to 10 or over to print stats messages */
@@ -299,8 +292,8 @@
void ixl_set_queue_rx_itr(struct ixl_queue *);
void ixl_set_queue_tx_itr(struct ixl_queue *);
-void ixl_add_filter(struct ixl_vsi *, u8 *, s16 vlan);
-void ixl_del_filter(struct ixl_vsi *, u8 *, s16 vlan);
+void ixl_add_filter(struct ixl_vsi *, const u8 *, s16 vlan);
+void ixl_del_filter(struct ixl_vsi *, const u8 *, s16 vlan);
void ixl_reconfigure_filters(struct ixl_vsi *vsi);
int ixl_disable_rings(struct ixl_vsi *);
@@ -331,7 +324,7 @@
void ixl_add_hw_filters(struct ixl_vsi *, int, int);
void ixl_del_hw_filters(struct ixl_vsi *, int);
struct ixl_mac_filter *
- ixl_find_filter(struct ixl_vsi *, u8 *, s16);
+ ixl_find_filter(struct ixl_vsi *, const u8 *, s16);
void ixl_add_mc_filter(struct ixl_vsi *, u8 *);
void ixl_free_mac_filters(struct ixl_vsi *vsi);
void ixl_update_vsi_stats(struct ixl_vsi *);
Index: sys/dev/ixl/ixl_pf_main.c
===================================================================
--- sys/dev/ixl/ixl_pf_main.c
+++ sys/dev/ixl/ixl_pf_main.c
@@ -89,6 +89,20 @@
extern int ixl_enable_iwarp;
#endif
+const uint8_t ixl_bcast_addr[ETHER_ADDR_LEN] =
+ {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+
+const char * const ixl_fc_string[6] = {
+ "None",
+ "Rx",
+ "Tx",
+ "Full",
+ "Priority",
+ "Default"
+};
+
+MALLOC_DEFINE(M_IXL, "ixl", "ixl driver allocations");
+
void
ixl_debug_core(struct ixl_pf *pf, enum ixl_dbg_mask mask, char *fmt, ...)
{
@@ -3193,7 +3207,7 @@
** This routine adds macvlan filters
*/
void
-ixl_add_filter(struct ixl_vsi *vsi, u8 *macaddr, s16 vlan)
+ixl_add_filter(struct ixl_vsi *vsi, const u8 *macaddr, s16 vlan)
{
struct ixl_mac_filter *f, *tmp;
struct ixl_pf *pf;
@@ -3239,7 +3253,7 @@
}
void
-ixl_del_filter(struct ixl_vsi *vsi, u8 *macaddr, s16 vlan)
+ixl_del_filter(struct ixl_vsi *vsi, const u8 *macaddr, s16 vlan)
{
struct ixl_mac_filter *f;
@@ -3264,7 +3278,7 @@
** Find the filter with both matching mac addr and vlan id
*/
struct ixl_mac_filter *
-ixl_find_filter(struct ixl_vsi *vsi, u8 *macaddr, s16 vlan)
+ixl_find_filter(struct ixl_vsi *vsi, const u8 *macaddr, s16 vlan)
{
struct ixl_mac_filter *f;
bool match = FALSE;
Index: sys/dev/ixl/ixl_txrx.c
===================================================================
--- sys/dev/ixl/ixl_txrx.c
+++ sys/dev/ixl/ixl_txrx.c
@@ -63,8 +63,6 @@
struct mbuf *, u8);
static inline bool ixl_tso_detect_sparse(struct mbuf *mp);
-static int ixl_tx_setup_offload(struct ixl_queue *que,
- struct mbuf *mp, u32 *cmd, u32 *off);
static inline u32 ixl_get_tx_head(struct ixl_queue *que);
#ifdef DEV_NETMAP

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 17, 8:51 AM (10 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25411072
Default Alt Text
D11414.id30714.diff (4 KB)

Event Timeline