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

Commit 134491fd authored by Hariprasad Shenai's avatar Hariprasad Shenai Committed by David S. Miller
Browse files

cxgb4: DCB message handler needs to use correct portid to netdev mapping 



Signed-off-by: default avatarHariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c3e324e3

drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ void cxgb4_dcb_handle_fw_update(struct adapter *adap, 
{

	const union fw_port_dcb *fwdcb = &pcmd->u.dcb;

	int port = FW_PORT_CMD_PORTID_G(be32_to_cpu(pcmd->op_to_portid));

	struct net_device *dev = adap->port[port];

	struct net_device *dev = adap->port[adap->chan_map[port]];

	struct port_info *pi = netdev_priv(dev);

	struct port_dcb_info *dcb = &pi->dcb;

	int dcb_type = pcmd->u.dcb.pgid.type;

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+3 −2
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ EXPORT_SYMBOL(cxgb4_dcb_enabled); 
static void dcb_rpl(struct adapter *adap, const struct fw_port_cmd *pcmd)

{

	int port = FW_PORT_CMD_PORTID_G(ntohl(pcmd->op_to_portid));

	struct net_device *dev = adap->port[port];

	struct net_device *dev = adap->port[adap->chan_map[port]];

	int old_dcb_enabled = cxgb4_dcb_enabled(dev);

	int new_dcb_enabled;
@@ -645,7 +645,8 @@ static int fwevtq_handler(struct sge_rspq *q, const __be64 *rsp, 
		    action == FW_PORT_ACTION_GET_PORT_INFO) {

			int port = FW_PORT_CMD_PORTID_G(

					be32_to_cpu(pcmd->op_to_portid));

			struct net_device *dev = q->adap->port[port];

			struct net_device *dev =

				q->adap->port[q->adap->chan_map[port]];

			int state_input = ((pcmd->u.info.dcbxdis_pkd &

					    FW_PORT_CMD_DCBXDIS_F)

					   ? CXGB4_DCB_INPUT_FW_DISABLED