mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-04 08:08:54 +00:00
Code Issues Releases Wiki Activity

bnx2x: function descriptions format fixed

Browse source 
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Dmitry Kravkov 2011-05-04 23:52:40 +00:00 committed by David S. Miller
parent 5de924086a
commit e892067497
6 changed files with 196 additions and 268 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
drivers/net/bnx2x/bnx2x_cmn.c
View file

@ -308,13 +308,15 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,
*/ */
#define TPA_TSTAMP_OPT_LEN 12 #define TPA_TSTAMP_OPT_LEN 12
/** /**
* Calculate the approximate value of the MSS for this * bnx2x_set_lro_mss - calculate the approximate value of the MSS
* aggregation using the first packet of it.
* *
* @param bp * @bp: driver handle
* @param parsing_flags Parsing flags from the START CQE * @parsing_flags: parsing flags from the START CQE
* @param len_on_bd Total length of the first packet for the * @len_on_bd: total length of the first packet for the
* aggregation. * aggregation.
*
* Approximate value of the MSS for this aggregation calculated using
* the first packet of it.
*/ */
static inline u16 bnx2x_set_lro_mss(struct bnx2x *bp, u16 parsing_flags, static inline u16 bnx2x_set_lro_mss(struct bnx2x *bp, u16 parsing_flags,
u16 len_on_bd) u16 len_on_bd)
@ -2083,12 +2085,11 @@ static inline void bnx2x_set_pbd_gso_e2(struct sk_buff *skb, u32 *parsing_data,
} }
/** /**
* Update PBD in GSO case. * bnx2x_set_pbd_gso - update PBD in GSO case.
* *
* @param skb * @skb: packet skb
* @param tx_start_bd * @pbd: parse BD
* @param pbd * @xmit_type: xmit flags
* @param xmit_type
*/ */
static inline void bnx2x_set_pbd_gso(struct sk_buff *skb, static inline void bnx2x_set_pbd_gso(struct sk_buff *skb,
struct eth_tx_parse_bd_e1x *pbd, struct eth_tx_parse_bd_e1x *pbd,
@ -2115,13 +2116,14 @@ static inline void bnx2x_set_pbd_gso(struct sk_buff *skb,
} }
/** /**
* bnx2x_set_pbd_csum_e2 - update PBD with checksum and return header length
* *
* @param skb * @bp: driver handle
* @param tx_start_bd * @skb: packet skb
* @param pbd_e2 * @parsing_data: data to be updated
* @param xmit_type * @xmit_type: xmit flags
* *
* @return header len * 57712 related
*/ */
static inline u8 bnx2x_set_pbd_csum_e2(struct bnx2x *bp, struct sk_buff *skb, static inline u8 bnx2x_set_pbd_csum_e2(struct bnx2x *bp, struct sk_buff *skb,
u32 *parsing_data, u32 xmit_type) u32 *parsing_data, u32 xmit_type)
@ -2146,13 +2148,12 @@ static inline u8 bnx2x_set_pbd_csum_e2(struct bnx2x *bp, struct sk_buff *skb,
} }
/** /**
* bnx2x_set_pbd_csum - update PBD with checksum and return header length
* *
* @param skb * @bp: driver handle
* @param tx_start_bd * @skb: packet skb
* @param pbd * @pbd: parse BD to be updated
* @param xmit_type * @xmit_type: xmit flags
*
* @return Header length
*/ */
static inline u8 bnx2x_set_pbd_csum(struct bnx2x *bp, struct sk_buff *skb, static inline u8 bnx2x_set_pbd_csum(struct bnx2x *bp, struct sk_buff *skb,
struct eth_tx_parse_bd_e1x *pbd, struct eth_tx_parse_bd_e1x *pbd,

307
drivers/net/bnx2x/bnx2x_cmn.h
View file

@ -63,43 +63,41 @@ extern int num_queues;
*/ */
/** /**
* Initialize link parameters structure variables. * bnx2x_initial_phy_init - initialize link parameters structure variables.
* *
* @param bp * @bp: driver handle
* @param load_mode * @load_mode: current mode
*
* @return u8
*/ */
u8 bnx2x_initial_phy_init(struct bnx2x *bp, int load_mode); u8 bnx2x_initial_phy_init(struct bnx2x *bp, int load_mode);
/** /**
* Configure hw according to link parameters structure. * bnx2x_link_set - configure hw according to link parameters structure.
* *
* @param bp * @bp: driver handle
*/ */
void bnx2x_link_set(struct bnx2x *bp); void bnx2x_link_set(struct bnx2x *bp);
/** /**
* Query link status * bnx2x_link_test - query link status.
* *
* @param bp * @bp: driver handle
* @param is_serdes * @is_serdes: bool
* *
* @return 0 - link is UP * Returns 0 if link is UP.
*/ */
u8 bnx2x_link_test(struct bnx2x *bp, u8 is_serdes); u8 bnx2x_link_test(struct bnx2x *bp, u8 is_serdes);
/** /**
* Handles link status change * bnx2x__link_status_update - handles link status change.
* *
* @param bp * @bp: driver handle
*/ */
void bnx2x__link_status_update(struct bnx2x *bp); void bnx2x__link_status_update(struct bnx2x *bp);
/** /**
* Report link status to upper layer * bnx2x_link_report - report link status to upper layer.
* *
* @param bp * @bp: driver handle
*/ */
void bnx2x_link_report(struct bnx2x *bp); void bnx2x_link_report(struct bnx2x *bp);
@ -107,212 +105,197 @@ void bnx2x_link_report(struct bnx2x *bp);
void __bnx2x_link_report(struct bnx2x *bp); void __bnx2x_link_report(struct bnx2x *bp);
/** /**
* calculates MF speed according to current linespeed and MF * bnx2x_get_mf_speed - calculate MF speed.
* configuration
* *
* @param bp * @bp: driver handle
* *
* @return u16 * Takes into account current linespeed and MF configuration.
*/ */
u16 bnx2x_get_mf_speed(struct bnx2x *bp); u16 bnx2x_get_mf_speed(struct bnx2x *bp);
/** /**
* MSI-X slowpath interrupt handler * bnx2x_msix_sp_int - MSI-X slowpath interrupt handler
* *
* @param irq * @irq: irq number
* @param dev_instance * @dev_instance: private instance
*
* @return irqreturn_t
*/ */
irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance); irqreturn_t bnx2x_msix_sp_int(int irq, void *dev_instance);
/** /**
* non MSI-X interrupt handler * bnx2x_interrupt - non MSI-X interrupt handler
* *
* @param irq * @irq: irq number
* @param dev_instance * @dev_instance: private instance
*
* @return irqreturn_t
*/ */
irqreturn_t bnx2x_interrupt(int irq, void *dev_instance); irqreturn_t bnx2x_interrupt(int irq, void *dev_instance);
#ifdef BCM_CNIC #ifdef BCM_CNIC
/** /**
* Send command to cnic driver * bnx2x_cnic_notify - send command to cnic driver
* *
* @param bp * @bp: driver handle
* @param cmd * @cmd: command
*/ */
int bnx2x_cnic_notify(struct bnx2x *bp, int cmd); int bnx2x_cnic_notify(struct bnx2x *bp, int cmd);
/** /**
* Provides cnic information for proper interrupt handling * bnx2x_setup_cnic_irq_info - provides cnic with IRQ information
* *
* @param bp * @bp: driver handle
*/ */
void bnx2x_setup_cnic_irq_info(struct bnx2x *bp); void bnx2x_setup_cnic_irq_info(struct bnx2x *bp);
#endif #endif
/** /**
* Enable HW interrupts. * bnx2x_int_enable - enable HW interrupts.
* *
* @param bp * @bp: driver handle
*/ */
void bnx2x_int_enable(struct bnx2x *bp); void bnx2x_int_enable(struct bnx2x *bp);
/** /**
* Disable interrupts. This function ensures that there are no * bnx2x_int_disable_sync - disable interrupts.
* ISRs or SP DPCs (sp_task) are running after it returns.
* *
* @param bp * @bp: driver handle
* @param disable_hw if true, disable HW interrupts. * @disable_hw: true, disable HW interrupts.
*
* This function ensures that there are no
* ISRs or SP DPCs (sp_task) are running after it returns.
*/ */
void bnx2x_int_disable_sync(struct bnx2x *bp, int disable_hw); void bnx2x_int_disable_sync(struct bnx2x *bp, int disable_hw);
/** /**
* Loads device firmware * bnx2x_init_firmware - loads device firmware
* *
* @param bp * @bp: driver handle
*
* @return int
*/ */
int bnx2x_init_firmware(struct bnx2x *bp); int bnx2x_init_firmware(struct bnx2x *bp);
/** /**
* Init HW blocks according to current initialization stage: * bnx2x_init_hw - init HW blocks according to current initialization stage.
* COMMON, PORT or FUNCTION.
* *
* @param bp * @bp: driver handle
* @param load_code: COMMON, PORT or FUNCTION * @load_code: COMMON, PORT or FUNCTION
*
* @return int
*/ */
int bnx2x_init_hw(struct bnx2x *bp, u32 load_code); int bnx2x_init_hw(struct bnx2x *bp, u32 load_code);
/** /**
* Init driver internals: * bnx2x_nic_init - init driver internals.
*
* @bp: driver handle
* @load_code: COMMON, PORT or FUNCTION
*
* Initializes:
* - rings * - rings
* - status blocks * - status blocks
* - etc. * - etc.
*
* @param bp
* @param load_code COMMON, PORT or FUNCTION
*/ */
void bnx2x_nic_init(struct bnx2x *bp, u32 load_code); void bnx2x_nic_init(struct bnx2x *bp, u32 load_code);
/** /**
* Allocate driver's memory. * bnx2x_alloc_mem - allocate driver's memory.
* *
* @param bp * @bp: driver handle
*
* @return int
*/ */
int bnx2x_alloc_mem(struct bnx2x *bp); int bnx2x_alloc_mem(struct bnx2x *bp);
/** /**
* Release driver's memory. * bnx2x_free_mem - release driver's memory.
* *
* @param bp * @bp: driver handle
*/ */
void bnx2x_free_mem(struct bnx2x *bp); void bnx2x_free_mem(struct bnx2x *bp);
/** /**
* Setup eth Client. * bnx2x_setup_client - setup eth client.
* *
* @param bp * @bp: driver handle
* @param fp * @fp: pointer to fastpath structure
* @param is_leading * @is_leading: boolean
*
* @return int
*/ */
int bnx2x_setup_client(struct bnx2x *bp, struct bnx2x_fastpath *fp, int bnx2x_setup_client(struct bnx2x *bp, struct bnx2x_fastpath *fp,
int is_leading); int is_leading);
/** /**
* Set number of queues according to mode * bnx2x_set_num_queues - set number of queues according to mode.
*
* @param bp
* *
* @bp: driver handle
*/ */
void bnx2x_set_num_queues(struct bnx2x *bp); void bnx2x_set_num_queues(struct bnx2x *bp);
/** /**
* Cleanup chip internals: * bnx2x_chip_cleanup - cleanup chip internals.
* - Cleanup MAC configuration.
* - Close clients.
* - etc.
* *
* @param bp * @bp: driver handle
* @param unload_mode * @unload_mode: COMMON, PORT, FUNCTION
*
* - Cleanup MAC configuration.
* - Closes clients.
* - etc.
*/ */
void bnx2x_chip_cleanup(struct bnx2x *bp, int unload_mode); void bnx2x_chip_cleanup(struct bnx2x *bp, int unload_mode);
/** /**
* Acquire HW lock. * bnx2x_acquire_hw_lock - acquire HW lock.
* *
* @param bp * @bp: driver handle
* @param resource Resource bit which was locked * @resource: resource bit which was locked
*
* @return int
*/ */
int bnx2x_acquire_hw_lock(struct bnx2x *bp, u32 resource); int bnx2x_acquire_hw_lock(struct bnx2x *bp, u32 resource);
/** /**
* Release HW lock. * bnx2x_release_hw_lock - release HW lock.
* *
* @param bp driver handle * @bp: driver handle
* @param resource Resource bit which was locked * @resource: resource bit which was locked
*
* @return int
*/ */
int bnx2x_release_hw_lock(struct bnx2x *bp, u32 resource); int bnx2x_release_hw_lock(struct bnx2x *bp, u32 resource);
/** /**
* Configure eth MAC address in the HW according to the value in * bnx2x_set_eth_mac - configure eth MAC address in the HW
* netdev->dev_addr.
* *
* @param bp driver handle * @bp: driver handle
* @param set * @set: set or clear
*
* Configures according to the value in netdev->dev_addr.
*/ */
void bnx2x_set_eth_mac(struct bnx2x *bp, int set); void bnx2x_set_eth_mac(struct bnx2x *bp, int set);
#ifdef BCM_CNIC #ifdef BCM_CNIC
/** /**
* Set/Clear FIP MAC(s) at the next enties in the CAM after the ETH * bnx2x_set_fip_eth_mac_addr - Set/Clear FIP MAC(s)
* MAC(s). This function will wait until the ramdord completion
* returns.
* *
* @param bp driver handle * @bp: driver handle
* @param set set or clear the CAM entry * @set: set or clear the CAM entry
* *
* @return 0 if cussess, -ENODEV if ramrod doesn't return. * Used next enties in the CAM after the ETH MAC(s).
* This function will wait until the ramdord completion returns.
* Return 0 if cussess, -ENODEV if ramrod doesn't return.
*/ */
int bnx2x_set_fip_eth_mac_addr(struct bnx2x *bp, int set); int bnx2x_set_fip_eth_mac_addr(struct bnx2x *bp, int set);
/** /**
* Set/Clear ALL_ENODE mcast MAC. * bnx2x_set_all_enode_macs - Set/Clear ALL_ENODE mcast MAC.
* *
* @param bp * @bp: driver handle
* @param set * @set: set or clear
*
* @return int
*/ */
int bnx2x_set_all_enode_macs(struct bnx2x *bp, int set); int bnx2x_set_all_enode_macs(struct bnx2x *bp, int set);
#endif #endif
/** /**
* Set MAC filtering configurations. * bnx2x_set_rx_mode - set MAC filtering configurations.
* *
* @remarks called with netif_tx_lock from dev_mcast.c * @dev: netdevice
* *
* @param dev net_device * called with netif_tx_lock from dev_mcast.c
*/ */
void bnx2x_set_rx_mode(struct net_device *dev); void bnx2x_set_rx_mode(struct net_device *dev);
/** /**
* Configure MAC filtering rules in a FW. * bnx2x_set_storm_rx_mode - configure MAC filtering rules in a FW.
* *
* @param bp driver handle * @bp: driver handle
*/ */
void bnx2x_set_storm_rx_mode(struct bnx2x *bp); void bnx2x_set_storm_rx_mode(struct bnx2x *bp);
@ -324,63 +307,59 @@ bool bnx2x_reset_is_done(struct bnx2x *bp);
void bnx2x_disable_close_the_gate(struct bnx2x *bp); void bnx2x_disable_close_the_gate(struct bnx2x *bp);
/** /**
* Perform statistics handling according to event * bnx2x_stats_handle - perform statistics handling according to event.
* *
* @param bp driver handle * @bp: driver handle
* @param event bnx2x_stats_event * @event: bnx2x_stats_event
*/ */
void bnx2x_stats_handle(struct bnx2x *bp, enum bnx2x_stats_event event); void bnx2x_stats_handle(struct bnx2x *bp, enum bnx2x_stats_event event);
/** /**
* Handle ramrods completion * bnx2x_sp_event - handle ramrods completion.
* *
* @param fp fastpath handle for the event * @fp: fastpath handle for the event
* @param rr_cqe eth_rx_cqe * @rr_cqe: eth_rx_cqe
*/ */
void bnx2x_sp_event(struct bnx2x_fastpath *fp, union eth_rx_cqe *rr_cqe); void bnx2x_sp_event(struct bnx2x_fastpath *fp, union eth_rx_cqe *rr_cqe);
/** /**
* Init/halt function before/after sending * bnx2x_func_start - init function
* CLIENT_SETUP/CFC_DEL for the first/last client.
* *
* @param bp * @bp: driver handle
* *
* @return int * Must be called before sending CLIENT_SETUP for the first client.
*/ */
int bnx2x_func_start(struct bnx2x *bp); int bnx2x_func_start(struct bnx2x *bp);
/** /**
* Prepare ILT configurations according to current driver * bnx2x_ilt_set_info - prepare ILT configurations.
* parameters.
* *
* @param bp * @bp: driver handle
*/ */
void bnx2x_ilt_set_info(struct bnx2x *bp); void bnx2x_ilt_set_info(struct bnx2x *bp);
/** /**
* Inintialize dcbx protocol * bnx2x_dcbx_init - initialize dcbx protocol.
* *
* @param bp * @bp: driver handle
*/ */
void bnx2x_dcbx_init(struct bnx2x *bp); void bnx2x_dcbx_init(struct bnx2x *bp);
/** /**
* Set power state to the requested value. Currently only D0 and * bnx2x_set_power_state - set power state to the requested value.
* D3hot are supported.
* *
* @param bp * @bp: driver handle
* @param state D0 or D3hot * @state: required state D0 or D3hot
* *
* @return int * Currently only D0 and D3hot are supported.
*/ */
int bnx2x_set_power_state(struct bnx2x *bp, pci_power_t state); int bnx2x_set_power_state(struct bnx2x *bp, pci_power_t state);
/** /**
* Updates MAX part of MF configuration in HW * bnx2x_update_max_mf_config - update MAX part of MF configuration in HW.
* (if required)
* *
* @param bp * @bp: driver handle
* @param value * @value: new value
*/ */
void bnx2x_update_max_mf_config(struct bnx2x *bp, u32 value); void bnx2x_update_max_mf_config(struct bnx2x *bp, u32 value);
@ -420,51 +399,51 @@ void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw);
void bnx2x_netif_start(struct bnx2x *bp); void bnx2x_netif_start(struct bnx2x *bp);
/** /**
* Fill msix_table, request vectors, update num_queues according * bnx2x_enable_msix - set msix configuration.
* to number of available vectors
* *
* @param bp * @bp: driver handle
* *
* @return int * fills msix_table, requests vectors, updates num_queues
* according to number of available vectors.
*/ */
int bnx2x_enable_msix(struct bnx2x *bp); int bnx2x_enable_msix(struct bnx2x *bp);
/** /**
* Request msi mode from OS, updated internals accordingly * bnx2x_enable_msi - request msi mode from OS, updated internals accordingly
* *
* @param bp * @bp: driver handle
*
* @return int
*/ */
int bnx2x_enable_msi(struct bnx2x *bp); int bnx2x_enable_msi(struct bnx2x *bp);
/** /**
* NAPI callback * bnx2x_poll - NAPI callback
* *
* @param napi * @napi: napi structure
* @param budget * @budget:
* *
* @return int
*/ */
int bnx2x_poll(struct napi_struct *napi, int budget); int bnx2x_poll(struct napi_struct *napi, int budget);
/** /**
* Allocate/release memories outsize main driver structure * bnx2x_alloc_mem_bp - allocate memories outsize main driver structure
* *
* @param bp * @bp: driver handle
*
* @return int
*/ */
int __devinit bnx2x_alloc_mem_bp(struct bnx2x *bp); int __devinit bnx2x_alloc_mem_bp(struct bnx2x *bp);
/**
* bnx2x_free_mem_bp - release memories outsize main driver structure
*
* @bp: driver handle
*/
void bnx2x_free_mem_bp(struct bnx2x *bp); void bnx2x_free_mem_bp(struct bnx2x *bp);
/** /**
* Change mtu netdev callback * bnx2x_change_mtu - change mtu netdev callback
* *
* @param dev * @dev: net device
* @param new_mtu * @new_mtu: requested mtu
* *
* @return int
*/ */
int bnx2x_change_mtu(struct net_device *dev, int new_mtu); int bnx2x_change_mtu(struct net_device *dev, int new_mtu);
@ -472,29 +451,12 @@ u32 bnx2x_fix_features(struct net_device *dev, u32 features);
int bnx2x_set_features(struct net_device *dev, u32 features); int bnx2x_set_features(struct net_device *dev, u32 features);
/** /**
* tx timeout netdev callback * bnx2x_tx_timeout - tx timeout netdev callback
* *
* @param dev * @dev: net device
* @param new_mtu
*
* @return int
*/ */
void bnx2x_tx_timeout(struct net_device *dev); void bnx2x_tx_timeout(struct net_device *dev);
#ifdef BCM_VLAN
/**
* vlan rx register netdev callback
*
* @param dev
* @param new_mtu
*
* @return int
*/
void bnx2x_vlan_rx_register(struct net_device *dev,
struct vlan_group *vlgrp);
#endif
static inline void bnx2x_update_fpsb_idx(struct bnx2x_fastpath *fp) static inline void bnx2x_update_fpsb_idx(struct bnx2x_fastpath *fp)
{ {
barrier(); /* status block is written to by the chip */ barrier(); /* status block is written to by the chip */
@ -745,7 +707,7 @@ static inline int bnx2x_has_rx_work(struct bnx2x_fastpath *fp)
/** /**
* disables tx from stack point of view * disables tx from stack point of view
* *
* @param bp * @bp: driver handle
*/ */
static inline void bnx2x_tx_disable(struct bnx2x *bp) static inline void bnx2x_tx_disable(struct bnx2x *bp)
{ {
@ -1149,12 +1111,11 @@ void bnx2x_acquire_phy_lock(struct bnx2x *bp);
void bnx2x_release_phy_lock(struct bnx2x *bp); void bnx2x_release_phy_lock(struct bnx2x *bp);
/** /**
* Extracts MAX BW part from MF configuration. * bnx2x_extract_max_cfg - extract MAX BW part from MF configuration.
* *
* @param bp * @bp: driver handle
* @param mf_cfg * @mf_cfg: MF configuration
* *
* @return u16
*/ */
static inline u16 bnx2x_extract_max_cfg(struct bnx2x *bp, u32 mf_cfg) static inline u16 bnx2x_extract_max_cfg(struct bnx2x *bp, u32 mf_cfg)
{ {

26
drivers/net/bnx2x/bnx2x_dcb.c
View file

@ -1079,12 +1079,6 @@ static void bnx2x_dcbx_get_num_pg_traf_type(struct bnx2x *bp,
} }
} }
/*******************************************************************************
* Description: single priority group
*
* Return:
******************************************************************************/
static void bnx2x_dcbx_ets_disabled_entry_data(struct bnx2x *bp, static void bnx2x_dcbx_ets_disabled_entry_data(struct bnx2x *bp,
struct cos_help_data *cos_data, struct cos_help_data *cos_data,
u32 pri_join_mask) u32 pri_join_mask)
@ -1097,11 +1091,6 @@ static void bnx2x_dcbx_ets_disabled_entry_data(struct bnx2x *bp,
cos_data->num_of_cos = 1; cos_data->num_of_cos = 1;
} }
/*******************************************************************************
* Description: updating the cos bw
*
* Return:
******************************************************************************/
static inline void bnx2x_dcbx_add_to_cos_bw(struct bnx2x *bp, static inline void bnx2x_dcbx_add_to_cos_bw(struct bnx2x *bp,
struct cos_entry_help_data *data, struct cos_entry_help_data *data,
u8 pg_bw) u8 pg_bw)
@ -1112,11 +1101,6 @@ static inline void bnx2x_dcbx_add_to_cos_bw(struct bnx2x *bp,
data->cos_bw += pg_bw; data->cos_bw += pg_bw;
} }
/*******************************************************************************
* Description: single priority group
*
* Return:
******************************************************************************/
static void bnx2x_dcbx_separate_pauseable_from_non(struct bnx2x *bp, static void bnx2x_dcbx_separate_pauseable_from_non(struct bnx2x *bp,
struct cos_help_data *cos_data, struct cos_help_data *cos_data,
u32 *pg_pri_orginal_spread, u32 *pg_pri_orginal_spread,
@ -1369,11 +1353,6 @@ static void bnx2x_dcbx_two_pg_to_cos_params(
} }
} }
/*******************************************************************************
* Description: Still
*
* Return:
******************************************************************************/
static void bnx2x_dcbx_three_pg_to_cos_params( static void bnx2x_dcbx_three_pg_to_cos_params(
struct bnx2x *bp, struct bnx2x *bp,
struct pg_help_data *pg_help_data, struct pg_help_data *pg_help_data,
@ -1561,11 +1540,6 @@ static void bnx2x_dcbx_get_ets_pri_pg_tbl(struct bnx2x *bp,
} }
} }
/*******************************************************************************
* Description: Fill pfc_config struct that will be sent in DCBX start ramrod
*
* Return:
******************************************************************************/
static void bnx2x_pfc_fw_struct_e2(struct bnx2x *bp) static void bnx2x_pfc_fw_struct_e2(struct bnx2x *bp)
{ {
struct flow_control_configuration *pfc_fw_cfg = NULL; struct flow_control_configuration *pfc_fw_cfg = NULL;

6
drivers/net/bnx2x/bnx2x_dcb.h
View file

@ -61,9 +61,6 @@ struct bnx2x_dcbx_port_params {
#define BNX2X_DCBX_OVERWRITE_SETTINGS_ENABLE 1 #define BNX2X_DCBX_OVERWRITE_SETTINGS_ENABLE 1
#define BNX2X_DCBX_OVERWRITE_SETTINGS_INVALID (BNX2X_DCBX_CONFIG_INV_VALUE) #define BNX2X_DCBX_OVERWRITE_SETTINGS_INVALID (BNX2X_DCBX_CONFIG_INV_VALUE)
/*******************************************************************************
* LLDP protocol configuration parameters.
******************************************************************************/
struct bnx2x_config_lldp_params { struct bnx2x_config_lldp_params {
u32 overwrite_settings; u32 overwrite_settings;
u32 msg_tx_hold; u32 msg_tx_hold;
@ -83,9 +80,6 @@ struct bnx2x_admin_priority_app_table {
u32 app_id; u32 app_id;
}; };
/*******************************************************************************
* DCBX protocol configuration parameters.
******************************************************************************/
struct bnx2x_config_dcbx_params { struct bnx2x_config_dcbx_params {
u32 overwrite_settings; u32 overwrite_settings;
u32 admin_dcbx_version; u32 admin_dcbx_version;

14
drivers/net/bnx2x/bnx2x_link.c
View file

@ -385,7 +385,7 @@ u8 bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos)
return 0; return 0;
} }
/******************************************************************/ /******************************************************************/
/* ETS section */ /* PFC section */
/******************************************************************/ /******************************************************************/
static void bnx2x_bmac2_get_pfc_stat(struct link_params *params, static void bnx2x_bmac2_get_pfc_stat(struct link_params *params,
@ -1301,14 +1301,12 @@ static u8 bnx2x_pbf_update(struct link_params *params, u32 flow_ctrl,
return 0; return 0;
} }
/* /**
* get_emac_base * bnx2x_get_emac_base - retrive emac base address
* *
* @param cb * @bp: driver handle
* @param mdc_mdio_access * @mdc_mdio_access: access type
* @param port * @port: port id
*
* @return u32
* *
* This function selects the MDC/MDIO access (through emac0 or * This function selects the MDC/MDIO access (through emac0 or
* emac1) depend on the mdc_mdio_access, port, port swapped. Each * emac1) depend on the mdc_mdio_access, port, port swapped. Each

66
drivers/net/bnx2x/bnx2x_main.c
View file

@ -6035,14 +6035,14 @@ static int bnx2x_func_stop(struct bnx2x *bp)
} }
/** /**
* Sets a MAC in a CAM for a few L2 Clients for E1x chips * bnx2x_set_mac_addr_gen - set a MAC in a CAM for a few L2 Clients for E1x chips
* *
* @param bp driver descriptor * @bp: driver handle
* @param set set or clear an entry (1 or 0) * @set: set or clear an entry (1 or 0)
* @param mac pointer to a buffer containing a MAC * @mac: pointer to a buffer containing a MAC
* @param cl_bit_vec bit vector of clients to register a MAC for * @cl_bit_vec: bit vector of clients to register a MAC for
* @param cam_offset offset in a CAM to use * @cam_offset: offset in a CAM to use
* @param is_bcast is the set MAC a broadcast address (for E1 only) * @is_bcast: is the set MAC a broadcast address (for E1 only)
*/ */
static void bnx2x_set_mac_addr_gen(struct bnx2x *bp, int set, const u8 *mac, static void bnx2x_set_mac_addr_gen(struct bnx2x *bp, int set, const u8 *mac,
u32 cl_bit_vec, u8 cam_offset, u32 cl_bit_vec, u8 cam_offset,
@ -6402,14 +6402,13 @@ void bnx2x_invalidate_e1h_mc_list(struct bnx2x *bp)
#ifdef BCM_CNIC #ifdef BCM_CNIC
/** /**
* Set iSCSI MAC(s) at the next enties in the CAM after the ETH * bnx2x_set_iscsi_eth_mac_addr - set iSCSI MAC(s).
* MAC(s). This function will wait until the ramdord completion
* returns.
* *
* @param bp driver handle * @bp: driver handle
* @param set set or clear the CAM entry * @set: set or clear the CAM entry
* *
* @return 0 if cussess, -ENODEV if ramrod doesn't return. * This function will wait until the ramdord completion returns.
* Return 0 if success, -ENODEV if ramrod doesn't return.
*/ */
static int bnx2x_set_iscsi_eth_mac_addr(struct bnx2x *bp, int set) static int bnx2x_set_iscsi_eth_mac_addr(struct bnx2x *bp, int set)
{ {
@ -6430,14 +6429,13 @@ static int bnx2x_set_iscsi_eth_mac_addr(struct bnx2x *bp, int set)
} }
/** /**
* Set FCoE L2 MAC(s) at the next enties in the CAM after the * bnx2x_set_fip_eth_mac_addr - set FCoE L2 MAC(s)
* ETH MAC(s). This function will wait until the ramdord
* completion returns.
* *
* @param bp driver handle * @bp: driver handle
* @param set set or clear the CAM entry * @set: set or clear the CAM entry
* *
* @return 0 if cussess, -ENODEV if ramrod doesn't return. * This function will wait until the ramrod completion returns.
* Returns 0 if success, -ENODEV if ramrod doesn't return.
*/ */
int bnx2x_set_fip_eth_mac_addr(struct bnx2x *bp, int set) int bnx2x_set_fip_eth_mac_addr(struct bnx2x *bp, int set)
{ {
@ -6641,12 +6639,11 @@ static int bnx2x_setup_fw_client(struct bnx2x *bp,
} }
/** /**
* Configure interrupt mode according to current configuration. * bnx2x_set_int_mode - configure interrupt mode
*
* @bp: driver handle
*
* In case of MSI-X it will also try to enable MSI-X. * In case of MSI-X it will also try to enable MSI-X.
*
* @param bp
*
* @return int
*/ */
static int __devinit bnx2x_set_int_mode(struct bnx2x *bp) static int __devinit bnx2x_set_int_mode(struct bnx2x *bp)
{ {
@ -7230,10 +7227,11 @@ static void bnx2x_clp_reset_prep(struct bnx2x *bp, u32 *magic_val)
MF_CFG_WR(bp, shared_mf_config.clp_mb, val | SHARED_MF_CLP_MAGIC); MF_CFG_WR(bp, shared_mf_config.clp_mb, val | SHARED_MF_CLP_MAGIC);
} }
/* Restore the value of the `magic' bit. /**
* bnx2x_clp_reset_done - restore the value of the `magic' bit.
* *
* @param pdev Device handle. * @bp: driver handle
* @param magic_val Old value of the `magic' bit. * @magic_val: old value of the `magic' bit.
*/ */
static void bnx2x_clp_reset_done(struct bnx2x *bp, u32 magic_val) static void bnx2x_clp_reset_done(struct bnx2x *bp, u32 magic_val)
{ {
@ -7244,10 +7242,12 @@ static void bnx2x_clp_reset_done(struct bnx2x *bp, u32 magic_val)
} }
/** /**
* Prepares for MCP reset: takes care of CLP configurations. * bnx2x_reset_mcp_prep - prepare for MCP reset.
* *
* @param bp * @bp: driver handle
* @param magic_val Old value of 'magic' bit. * @magic_val: old value of 'magic' bit.
*
* Takes care of CLP configurations.
*/ */
static void bnx2x_reset_mcp_prep(struct bnx2x *bp, u32 *magic_val) static void bnx2x_reset_mcp_prep(struct bnx2x *bp, u32 *magic_val)
{ {
@ -7272,10 +7272,10 @@ static void bnx2x_reset_mcp_prep(struct bnx2x *bp, u32 *magic_val)
#define MCP_TIMEOUT 5000 /* 5 seconds (in ms) */ #define MCP_TIMEOUT 5000 /* 5 seconds (in ms) */
#define MCP_ONE_TIMEOUT 100 /* 100 ms */ #define MCP_ONE_TIMEOUT 100 /* 100 ms */
/* Waits for MCP_ONE_TIMEOUT or MCP_ONE_TIMEOUT*10, /**
* depending on the HW type. * bnx2x_mcp_wait_one - wait for MCP_ONE_TIMEOUT
* *
* @param bp * @bp: driver handle
*/ */
static inline void bnx2x_mcp_wait_one(struct bnx2x *bp) static inline void bnx2x_mcp_wait_one(struct bnx2x *bp)
{ {