bnx2x: namespace cleanup
RFC 1/1 bnx2x: namespace cleanup
Fix a bunch of whole lot of namespace issues with the Broadcom bnx2x driver found by running 'make namespacecheck'
* several global variables were not prefixed (num_queues, load_count) and could cause conflicts in future.
* make local functions static
* remove resulting dead code fallout
bnx2x_pfc_statistic,
bnx2x_init_vlan_mac_obj, bnx2x_vlan_mac_h_write_unlock, bnx2x_emac_get_pfc_stat
bnx2x_put_credit_vlan_mac, bnx2x_get_credit_vlan_mac ...
Looks like vlan support in this driver was a botch from day one either never worked, or not implemented.
Compile tested only
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 drivers/net/ethernet/broadcom/bnx2x/bnx2x.mod.c | 82 +++--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 55 +++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 128 ---------- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 66 ----- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 8 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 94 ++++++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 265 ---------------------- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 13 - drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 8 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 14 - drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 17 - 12 files changed, 187 insertions(+), 565 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +0 -2
@@ -1881,7 +1881,6 @@ struct bnx2x { };/* Tx queues may be less or equal to Rx queues */ -extern int num_queues;#define BNX2X_NUM_QUEUES (bp) (bp->num_queues)#define BNX2X_NUM_ETH_QUEUES (bp) ((bp)->num_ethernet_queues)#define BNX2X_NUM_NON_CNIC_QUEUES (bp) (BNX2X_NUM_QUEUES(bp) - \
@@ -2053,7 +2052,6 @@ int bnx2x_del_all_macs(struct bnx2x *bp,void bnx2x_func_init (struct bnx2x *bp,struct bnx2x_func_init_params *p);void bnx2x_init_sb (struct bnx2x *bp,dma_addr_t mapping,int vfid,u8 vf_valid,int fw_sb_id,int igu_sb_id); -u32 bnx2x_get_pretend_reg (struct bnx2x *bp);int bnx2x_get_gpio (struct bnx2x *bp,int gpio_num,u8 port);int bnx2x_set_gpio (struct bnx2x *bp,int gpio_num,u32 mode,u8 port);int bnx2x_set_mult_gpio (struct bnx2x *bp,u8 pins,u32 mode);
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +43 -12
93 lines not on this page · raw message
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +4 -124
188 lines not on this page · raw message
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +73 -21
162 lines not on this page · raw message
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c +2 -263
319 lines not on this page · raw message
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h +0 -13
@@ -441,9 +441,6 @@ enum { BNX2X_LLH_CAM_MAX_PF_LINE = NIG_REG_LLH1_FUNC_MEM_SIZE / 2 }; -void bnx2x_set_mac_in_nig (struct bnx2x *bp, -bool add,unsigned char *dev_addr,int index); -/** RX_MODE verbs:DROP_ALL/ACCEPT_ALL/ACCEPT_ALL_MULTI/ACCEPT_ALL_VLAN/NORMAL */ /* RX_MODE ramrod special flags: set in rx_mode_flags field in
@@ -1300,22 +1297,12 @@ void bnx2x_init_vlan_obj(struct bnx2x *b unsigned long *pstate, bnx2x_obj_type type, struct bnx2x_credit_pool_obj *vlans_pool); -void bnx2x_init_vlan_mac_obj (struct bnx2x *bp, -struct bnx2x_vlan_mac_obj *vlan_mac_obj, -u8 cl_id,u32 cid,u8 func_id,void *rdata, -dma_addr_t rdata_mapping,int state, -unsigned long *pstate,bnx2x_obj_type type, -struct bnx2x_credit_pool_obj *macs_pool, -struct bnx2x_credit_pool_obj *vlans_pool); -int bnx2x_vlan_mac_h_read_lock (struct bnx2x *bp,struct bnx2x_vlan_mac_obj *o);void bnx2x_vlan_mac_h_read_unlock (struct bnx2x *bp,struct bnx2x_vlan_mac_obj *o);int bnx2x_vlan_mac_h_write_lock (struct bnx2x *bp,struct bnx2x_vlan_mac_obj *o); -void bnx2x_vlan_mac_h_write_unlock (struct bnx2x *bp, -struct bnx2x_vlan_mac_obj *o);int bnx2x_config_vlan_mac (struct bnx2x *bp,struct bnx2x_vlan_mac_ramrod_params *p);
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +4 -4
@@ -798,10 +798,10 @@ int bnx2x_vfop_mac_list_cmd(struct bnx2xreturn -ENOMEM ; } -int bnx2x_vfop_vlan_set_cmd (struct bnx2x *bp, -struct bnx2x_virtf *vf, -struct bnx2x_vfop_cmd *cmd, -int qid,u16 vid,bool add) +static int bnx2x_vfop_vlan_set_cmd (struct bnx2x *bp, +struct bnx2x_virtf *vf, +struct bnx2x_vfop_cmd *cmd, +int qid,u16 vid,bool add) {struct bnx2x_vfop *vfop =bnx2x_vfop_add (bp, vf);int rc;
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h +0 -14
@@ -663,11 +663,6 @@ int bnx2x_vfop_mac_list_cmd(struct bnx2xstruct bnx2x_vfop_filters *macs, int qid, bool drv_only); -int bnx2x_vfop_vlan_set_cmd (struct bnx2x *bp, -struct bnx2x_virtf *vf, -struct bnx2x_vfop_cmd *cmd, -int qid,u16 vid,bool add); - int bnx2x_vfop_vlan_list_cmd(struct bnx2x *bp, struct bnx2x_virtf *vf, struct bnx2x_vfop_cmd *cmd,
@@ -725,13 +720,6 @@ void bnx2x_vf_enable_access(struct bnx2x/* Handles an FLR (or VF_DISABLE) notification form the MCP */ void bnx2x_vf_handle_flr_event (struct bnx2x *bp); -void bnx2x_add_tlv (struct bnx2x *bp,void *tlvs_list,u16 offset,u16 type, -u16 length); -void bnx2x_vfpf_prep (struct bnx2x *bp,struct vfpf_first_tlv *first_tlv, -u16 type,u16 length); -void bnx2x_vfpf_finalize (struct bnx2x *bp,struct vfpf_first_tlv *first_tlv); -void bnx2x_dp_tlv_list (struct bnx2x *bp,void *tlvs_list); -bool bnx2x_tlv_supported (u16 tlvtype); u32 bnx2x_crc_vf_bulletin(struct bnx2x *bp,
@@ -748,7 +736,6 @@ int bnx2x_vfpf_init(struct bnx2x *bp);void bnx2x_vfpf_close_vf (struct bnx2x *bp);int bnx2x_vfpf_setup_q (struct bnx2x *bp,struct bnx2x_fastpath *fp,bool is_leading); -int bnx2x_vfpf_teardown_queue (struct bnx2x *bp,int qidx);int bnx2x_vfpf_config_mac (struct bnx2x *bp,u8 *addr,u8 vf_qid,bool set);int bnx2x_vfpf_config_rss (struct bnx2x *bp,struct bnx2x_config_rss_params *params);
@@ -812,7 +799,6 @@ static inline int bnx2x_vfpf_release(strstatic inline int bnx2x_vfpf_init (struct bnx2x *bp) {return 0 ; }static inline void bnx2x_vfpf_close_vf (struct bnx2x *bp) {}static inline int bnx2x_vfpf_setup_q (struct bnx2x *bp,struct bnx2x_fastpath *fp,bool is_leading) {return 0 ; } -static inline int bnx2x_vfpf_teardown_queue (struct bnx2x *bp,int qidx) {return 0 ; }static inline int bnx2x_vfpf_config_mac (struct bnx2x *bp,u8 *addr,u8 vf_qid,bool set) {return 0 ; } static inline int bnx2x_vfpf_config_rss(struct bnx2x *bp,
drivers/net/ethernet/broadcom/bnx2x/bnx2x.mod.c +41 -41
187 lines not on this page · raw message
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c +10 -56
90 lines not on this page · raw message
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h +0 -8
@@ -534,18 +534,10 @@ int bnx2x_ets_e3b0_config(const struct lconst struct link_vars *vars, struct bnx2x_ets_params *ets_params);/* Read pfc statistic*/ -void bnx2x_pfc_statistic (struct link_params *params,struct link_vars *vars, -u32 pfc_frames_sent[2 ], -u32 pfc_frames_received[2 ]);void bnx2x_init_mod_abs_int (struct bnx2x *bp,struct link_vars *vars,u32 chip_id,u32 shmem_base,u32 shmem2_base,u8 port); -int bnx2x_sfp_module_detection (struct bnx2x_phy *phy, -struct link_params *params); -void bnx2x_period_func (struct link_params *params,struct link_vars *vars); -int bnx2x_check_half_open_conn (struct link_params *params, -struct link_vars *vars,u8 notify);#endif /* BNX2X_LINK_H */
drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c +10 -7
@@ -21,9 +21,11 @@#include "bnx2x_cmn.h" #include <linux/crc32.h> +static int bnx2x_vfpf_teardown_queue (struct bnx2x *bp,int qidx); +/* place a given tlv on the tlv buffer at a given offset */ -void bnx2x_add_tlv (struct bnx2x *bp,void *tlvs_list,u16 offset,u16 type, -u16 length) +static void bnx2x_add_tlv (struct bnx2x *bp,void *tlvs_list,u16 offset, +u16 type,u16 length) {struct channel_tlv *tl = (struct channel_tlv *)(tlvs_list + offset);
@@ -33,8 +35,8 @@ void bnx2x_add_tlv(struct bnx2x *bp, voi }/* Clear the mailbox and init the header of the first tlv */ -void bnx2x_vfpf_prep (struct bnx2x *bp,struct vfpf_first_tlv *first_tlv, -u16 type,u16 length) +static void bnx2x_vfpf_prep (struct bnx2x *bp,struct vfpf_first_tlv *first_tlv, +u16 type,u16 length) {mutex_lock (&bp->vf2pf_mutex);
@@ -52,7 +54,8 @@ void bnx2x_vfpf_prep(struct bnx2x *bp, s }/* releases the mailbox */ -void bnx2x_vfpf_finalize (struct bnx2x *bp,struct vfpf_first_tlv *first_tlv) +static void bnx2x_vfpf_finalize (struct bnx2x *bp, +struct vfpf_first_tlv *first_tlv) {DP (BNX2X_MSG_IOV ,"done sending [%d] tlv over vf pf channel\n" , first_tlv->tl.type);
@@ -85,7 +88,7 @@ static void *bnx2x_search_tlv_list(struc }/* list the types and lengths of the tlvs on the buffer */ -void bnx2x_dp_tlv_list (struct bnx2x *bp,void *tlvs_list) +static void bnx2x_dp_tlv_list (struct bnx2x *bp,void *tlvs_list) {int i =1 ;struct channel_tlv *tlv = (struct channel_tlv *)tlvs_list;
@@ -633,7 +636,7 @@ int bnx2x_vfpf_setup_q(struct bnx2x *bp,return rc; } -int bnx2x_vfpf_teardown_queue (struct bnx2x *bp,int qidx) +static int bnx2x_vfpf_teardown_queue (struct bnx2x *bp,int qidx) {struct vfpf_q_op_tlv *req = &bp->vf2pf_mbox->req.q_op;struct pfvf_general_resp_tlv *resp = &bp->vf2pf_mbox->resp.general_resp;