bnx2x: Semantic change of empty lines (d76a6111) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

+0 −23

Original line number	Diff line number	Diff line
		@@ -34,12 +34,10 @@
		#define BCM_DCBNL
		#endif


		#include "bnx2x_hsi.h"

		#include "../cnic_if.h"


		#define BNX2X_MIN_MSIX_VEC_CNT(bp) ((bp)->min_msix_vec_cnt)

		#include <linux/mdio.h>
		@@ -114,7 +112,6 @@ do { \
		#define BNX2X_ERROR(fmt, ...) \
		pr_err("[%s:%d]" fmt, __func__, __LINE__, ##__VA_ARGS__)


		/* before we have a dev->name use dev_info() */
		#define BNX2X_DEV_INFO(fmt, ...) \
		do { \
		@@ -147,7 +144,6 @@ do { \
		#define U64_HI(x) ((u32)(((u64)(x)) >> 32))
		#define HILO_U64(hi, lo) ((((u64)(hi)) << 32) + (lo))


		#define REG_ADDR(bp, offset) ((bp->regview) + (offset))

		#define REG_RD(bp, offset) readl(REG_ADDR(bp, offset))
		@@ -387,7 +383,6 @@ union db_prod {
		#define BIT_VEC64_ELEM_SHIFT 6
		#define BIT_VEC64_ELEM_MASK ((u64)BIT_VEC64_ELEM_SZ - 1)


		#define __BIT_VEC64_SET_BIT(el, bit) \
		do { \
		el = ((el) \| ((u64)0x1 << (bit))); \
		@@ -398,7 +393,6 @@ union db_prod {
		el = ((el) & (~((u64)0x1 << (bit)))); \
		} while (0)


		#define BIT_VEC64_SET_BIT(vec64, idx) \
		__BIT_VEC64_SET_BIT((vec64)[(idx) >> BIT_VEC64_ELEM_SHIFT], \
		(idx) & BIT_VEC64_ELEM_MASK)
		@@ -419,8 +413,6 @@ union db_prod {

		/*******************************************************/



		/* Number of u64 elements in SGE mask array */
		#define RX_SGE_MASK_LEN (NUM_RX_SGE / BIT_VEC64_ELEM_SZ)
		#define RX_SGE_MASK_LEN_MASK (RX_SGE_MASK_LEN - 1)
		@@ -580,12 +572,10 @@ struct bnx2x_fastpath {
		txdata_ptr[FIRST_TX_COS_INDEX] \
		->var)


		#define IS_ETH_FP(fp) ((fp)->index < BNX2X_NUM_ETH_QUEUES((fp)->bp))
		#define IS_FCOE_FP(fp) ((fp)->index == FCOE_IDX((fp)->bp))
		#define IS_FCOE_IDX(idx) ((idx) == FCOE_IDX(bp))


		/* MC hsi */
		#define MAX_FETCH_BD 13 /* HW max BDs per packet */
		#define RX_COPY_THRESH 92
		@@ -693,12 +683,10 @@ struct bnx2x_fastpath {
		FW_DROP_LEVEL(bp))
		#define RCQ_TH_HI(bp) (RCQ_TH_LO(bp) + DROPLESS_FC_HEADROOM)


		/* This is needed for determining of last_max */
		#define SUB_S16(a, b) (s16)((s16)(a) - (s16)(b))
		#define SUB_S32(a, b) (s32)((s32)(a) - (s32)(b))


		#define BNX2X_SWCID_SHIFT 17
		#define BNX2X_SWCID_MASK ((0x1 << BNX2X_SWCID_SHIFT) - 1)

		@@ -723,7 +711,6 @@ struct bnx2x_fastpath {
		DPM_TRIGER_TYPE); \
		} while (0)


		/* TX CSUM helpers */
		#define SKB_CS_OFF(skb) (offsetof(struct tcphdr, check) - \
		skb->csum_offset)
		@@ -766,7 +753,6 @@ struct bnx2x_fastpath {
		#define BNX2X_RX_SUM_FIX(cqe) \
		BNX2X_PRS_FLAG_OVERETH_IPV4(cqe->fast_path_cqe.pars_flags.flags)


		#define FP_USB_FUNC_OFF \
		offsetof(struct cstorm_status_block_u, func)
		#define FP_CSB_FUNC_OFF \
		@@ -1068,7 +1054,6 @@ struct bnx2x_slowpath {
		struct eth_classify_rules_ramrod_data e2;
		} mac_rdata;


		union {
		struct tstorm_eth_mac_filter_config e1x;
		struct eth_filter_rules_ramrod_data e2;
		@@ -1119,7 +1104,6 @@ struct bnx2x_slowpath {
		#define bnx2x_sp_mapping(bp, var) \
		(bp->slowpath_mapping + offsetof(struct bnx2x_slowpath, var))


		/* attn group wiring */
		#define MAX_DYNAMIC_ATTN_GRPS 8

		@@ -1225,7 +1209,6 @@ enum {
		BNX2X_SP_RTNL_HYPERVISOR_VLAN,
		};


		struct bnx2x_prev_path_list {
		struct list_head list;
		u8 bus;
		@@ -1755,7 +1738,6 @@ extern int num_queues;
		#define FUNC_FLG_SPQ 0x0010
		#define FUNC_FLG_LEADING 0x0020 /* PF only */


		struct bnx2x_func_init_params {
		/* dma */
		dma_addr_t fw_stat_map; /* valid iff FUNC_FLG_STATS */
		@@ -1853,9 +1835,6 @@ struct bnx2x_func_init_params {

		#define skip_queue(bp, idx) (NO_FCOE(bp) && IS_FCOE_IDX(idx))




		/**
		* bnx2x_set_mac_one - configure a single MAC address
		*
		@@ -2000,7 +1979,6 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id,
		#define UNLOAD_CLOSE 1
		#define UNLOAD_RECOVERY 2


		/* DMAE command defines */
		#define DMAE_TIMEOUT -1
		#define DMAE_PCI_ERROR -2 /* E2 and onward */
		@@ -2102,7 +2080,6 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id,
		#define SP_DESC_CNT (BCM_PAGE_SIZE / sizeof(struct eth_spe))
		#define MAX_SP_DESC_CNT (SP_DESC_CNT - 1)


		#define BNX2X_BTR 4
		#define MAX_SPQ_PENDING 8

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+1 −11

Original line number	Diff line number	Diff line
		@@ -165,7 +165,6 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x bp, struct bnx2x_fp_txdata txdata,
		dma_unmap_single(&bp->pdev->dev, BD_UNMAP_ADDR(tx_start_bd),
		BD_UNMAP_LEN(tx_start_bd), DMA_TO_DEVICE);


		nbd = le16_to_cpu(tx_start_bd->nbd) - 1;
		#ifdef BNX2X_STOP_ON_ERROR
		if ((nbd - 1) > (MAX_SKB_FRAGS + 2)) {
		@@ -733,7 +732,6 @@ static void bnx2x_tpa_stop(struct bnx2x bp, struct bnx2x_fastpath fp,
		dev_kfree_skb_any(skb);
		}


		/* put new data in bin */
		rx_buf->data = new_data;

		@@ -899,7 +897,6 @@ int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
		cqe_fp);

		goto next_rx;

		}
		queue = cqe->end_agg_cqe.queue_index;
		tpa_info = &fp->tpa_info[queue];
		@@ -1004,7 +1001,6 @@ reuse_rx:
		le16_to_cpu(cqe_fp->vlan_tag));
		napi_gro_receive(&fp->napi, skb);


		next_rx:
		rx_buf->data = NULL;

		@@ -2322,10 +2318,10 @@ static void bnx2x_nic_load_afex_dcc(struct bnx2x *bp, int load_code)
		static void bnx2x_bz_fp(struct bnx2x *bp, int index)
		{
		struct bnx2x_fastpath *fp = &bp->fp[index];

		int cos;
		struct napi_struct orig_napi = fp->napi;
		struct bnx2x_agg_info *orig_tpa_info = fp->tpa_info;

		/* bzero bnx2x_fastpath contents */
		if (fp->tpa_info)
		memset(fp->tpa_info, 0, ETH_MAX_AGGREGATION_QUEUES_E1H_E2 *
		@@ -2435,7 +2431,6 @@ int bnx2x_load_cnic(struct bnx2x *bp)
		if (bp->state == BNX2X_STATE_OPEN)
		bnx2x_cnic_notify(bp, CNIC_CTL_START_CMD);


		DP(NETIF_MSG_IFUP, "Ending successfully CNIC-related load\n");

		return 0;
		@@ -2961,7 +2956,6 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link)
		bnx2x_set_reset_global(bp);
		}


		/* The last driver must disable a "close the gate" if there is no
		* parity attention or "process kill" pending.
		*/
		@@ -4480,7 +4474,6 @@ int bnx2x_alloc_mem_bp(struct bnx2x *bp)
		alloc_err:
		bnx2x_free_mem_bp(bp);
		return -ENOMEM;

		}

		int bnx2x_reload_if_running(struct net_device *dev)
		@@ -4522,7 +4515,6 @@ int bnx2x_get_cur_phy_idx(struct bnx2x *bp)
		}

		return sel_phy_idx;

		}
		int bnx2x_get_link_cfg_idx(struct bnx2x *bp)
		{
		@@ -4739,7 +4731,6 @@ int bnx2x_resume(struct pci_dev *pdev)
		return rc;
		}


		void bnx2x_set_ctx_validation(struct bnx2x bp, struct eth_context cxt,
		u32 cid)
		{
		@@ -4757,7 +4748,6 @@ static void storm_memset_hc_timeout(struct bnx2x *bp, u8 port,
		u8 fw_sb_id, u8 sb_index,
		u8 ticks)
		{

		u32 addr = BAR_CSTRORM_INTMEM +
		CSTORM_STATUS_BLOCK_DATA_TIMEOUT_OFFSET(fw_sb_id, sb_index);
		REG_WR8(bp, addr, ticks);

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@
		#include <linux/netdevice.h>
		#include <linux/etherdevice.h>


		#include "bnx2x.h"
		#include "bnx2x_sriov.h"

		@@ -1171,7 +1170,6 @@ static inline u8 bnx2x_cnic_eth_cl_id(struct bnx2x *bp, u8 cl_idx)

		static inline u8 bnx2x_cnic_fw_sb_id(struct bnx2x *bp)
		{

		/* the 'first' id is allocated for the cnic */
		return bp->base_fw_ndsb;
		}
		@@ -1181,7 +1179,6 @@ static inline u8 bnx2x_cnic_igu_sb_id(struct bnx2x *bp)
		return bp->igu_base_sb;
		}


		static inline void bnx2x_init_fcoe_fp(struct bnx2x *bp)
		{
		struct bnx2x_fastpath *fp = bnx2x_fcoe_fp(bp);

drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -253,7 +253,6 @@ static void bnx2x_dcbx_get_ets_feature(struct bnx2x *bp,

		memset(&pg_help_data, 0, sizeof(struct pg_help_data));


		if (GET_FLAGS(error, DCBX_LOCAL_ETS_ERROR))
		DP(BNX2X_MSG_DCB, "DCBX_LOCAL_ETS_ERROR\n");

		@@ -298,7 +297,6 @@ static void bnx2x_dcbx_get_ets_feature(struct bnx2x *bp,
		static void bnx2x_dcbx_get_pfc_feature(struct bnx2x *bp,
		struct dcbx_pfc_feature *pfc, u32 error)
		{

		if (GET_FLAGS(error, DCBX_LOCAL_PFC_ERROR))
		DP(BNX2X_MSG_DCB, "DCBX_LOCAL_PFC_ERROR\n");

		@@ -367,7 +365,6 @@ static int bnx2x_dcbx_read_mib(struct bnx2x *bp,
		struct lldp_remote_mib *remote_mib ;
		struct lldp_local_mib *local_mib;


		switch (read_mib_type) {
		case DCBX_READ_LOCAL_MIB:
		mib_size = sizeof(struct lldp_local_mib);
		@@ -629,7 +626,6 @@ static int bnx2x_dcbx_read_shmem_neg_results(struct bnx2x *bp)
		return 0;
		}


		#ifdef BCM_DCBNL
		static inline
		u8 bnx2x_dcbx_dcbnl_app_up(struct dcbx_app_priority_entry *ent)
		@@ -896,13 +892,11 @@ static void bnx2x_dcbx_admin_mib_updated_params(struct bnx2x *bp,
		}

		af->app.default_pri = (u8)dp->admin_default_priority;

		}

		/* Write the data. */
		bnx2x_write_data(bp, (u32 *)&admin_mib, offset,
		sizeof(struct lldp_admin_mib));

		}

		void bnx2x_dcbx_set_state(struct bnx2x *bp, bool dcb_on, u32 dcbx_enabled)
		@@ -1181,7 +1175,6 @@ static void bnx2x_dcbx_separate_pauseable_from_non(struct bnx2x *bp,
		BNX2X_ERR("dcbx error: Both groups must have priorities\n");
		}


		#ifndef POWER_OF_2
		#define POWER_OF_2(x) ((0 != x) && (0 == (x & (x-1))))
		#endif
		@@ -1524,7 +1517,6 @@ static void bnx2x_dcbx_2cos_limit_cee_three_pg_to_cos_params(
		}
		}


		static void bnx2x_dcbx_2cos_limit_cee_fill_cos_params(struct bnx2x *bp,
		struct pg_help_data *help_data,
		struct dcbx_ets_feature *ets,
		@@ -1533,7 +1525,6 @@ static void bnx2x_dcbx_2cos_limit_cee_fill_cos_params(struct bnx2x *bp,
		u32 pri_join_mask,
		u8 num_of_dif_pri)
		{

		/* default E2 settings */
		cos_data->num_of_cos = DCBX_COS_MAX_NUM_E2;

		@@ -1629,7 +1620,6 @@ static u8 bnx2x_dcbx_cee_fill_strict_pri(struct bnx2x *bp,
		u8 num_spread_of_entries,
		u8 strict_app_pris)
		{

		if (bnx2x_dcbx_spread_strict_pri(bp, cos_data, entry,
		num_spread_of_entries,
		strict_app_pris)) {
		@@ -1876,7 +1866,6 @@ void bnx2x_dcbx_pmf_update(struct bnx2x *bp)
		* dcbx negotiation.
		*/
		bnx2x_dcbx_update_tc_mapping(bp);

		}
		}

drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -134,8 +134,6 @@ enum {
		#define PFC_BRB1_REG_HIGH_LLFC_LOW_THRESHOLD 130
		#define PFC_BRB1_REG_HIGH_LLFC_HIGH_THRESHOLD 170



		struct cos_entry_help_data {
		u32 pri_join_mask;
		u32 cos_bw;
		@@ -170,7 +168,6 @@ struct cos_help_data {
		(!(IS_DCBX_PFC_PRI_ONLY_NON_PAUSE((bp), (pg_pri)) \|\| \
		IS_DCBX_PFC_PRI_ONLY_PAUSE((bp), (pg_pri))))


		struct pg_entry_help_data {
		u8 num_of_dif_pri;
		u8 pg;