Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f233cafe authored by Dmitry Kravkov's avatar Dmitry Kravkov Committed by David S. Miller
Browse files

bnx2x: use rx_queue index for skb_record_rx_queue() 



Signed-off-by: default avatarDmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 62ac0dc9

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -507,6 +507,7 @@ struct bnx2x_fastpath { 
	__le16			fp_hc_idx;

	__le16			fp_hc_idx;





	u8			index;		/* number in fp array */

	u8			index;		/* number in fp array */

	u8			rx_queue;	/* index for skb_record */

	u8			cl_id;		/* eth client id */

	u8			cl_id;		/* eth client id */

	u8			cl_qzone_id;

	u8			cl_qzone_id;

	u8			fw_sb_id;	/* status block number in FW */

	u8			fw_sb_id;	/* status block number in FW */

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -755,7 +755,7 @@ reuse_rx: 
			}

			}

		}

		}





		skb_record_rx_queue(skb, fp->index);

		skb_record_rx_queue(skb, fp->rx_queue);





		if (le16_to_cpu(cqe_fp->pars_flags.flags) &

		if (le16_to_cpu(cqe_fp->pars_flags.flags) &

		    PARSING_FLAGS_VLAN)

		    PARSING_FLAGS_VLAN)

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -1318,6 +1318,7 @@ static inline void bnx2x_init_fcoe_fp(struct bnx2x *bp) 
	struct bnx2x_fastpath *fp = bnx2x_fcoe_fp(bp);

	struct bnx2x_fastpath *fp = bnx2x_fcoe_fp(bp);

	unsigned long q_type = 0;

	unsigned long q_type = 0;





	bnx2x_fcoe(bp, rx_queue) = BNX2X_NUM_ETH_QUEUES(bp);

	bnx2x_fcoe(bp, cl_id) = bnx2x_cnic_eth_cl_id(bp,

	bnx2x_fcoe(bp, cl_id) = bnx2x_cnic_eth_cl_id(bp,

						     BNX2X_FCOE_ETH_CL_ID_IDX);

						     BNX2X_FCOE_ETH_CL_ID_IDX);

	/** Current BNX2X_FCOE_ETH_CID deffinition implies not more than

	/** Current BNX2X_FCOE_ETH_CID deffinition implies not more than

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -5247,7 +5247,7 @@ static void bnx2x_init_eth_fp(struct bnx2x *bp, int fp_idx) 
	u8 cos;

	u8 cos;

	unsigned long q_type = 0;

	unsigned long q_type = 0;

	u32 cids[BNX2X_MULTI_TX_COS] = { 0 };

	u32 cids[BNX2X_MULTI_TX_COS] = { 0 };



	fp->rx_queue = fp_idx;

	fp->cid = fp_idx;

	fp->cid = fp_idx;

	fp->cl_id = bnx2x_fp_cl_id(fp);

	fp->cl_id = bnx2x_fp_cl_id(fp);

	fp->fw_sb_id = bnx2x_fp_fw_sb_id(fp);

	fp->fw_sb_id = bnx2x_fp_fw_sb_id(fp);