Commit c7b74967 authored by Oliver Hartkopp's avatar Oliver Hartkopp Committed by Marc Kleine-Budde
Browse files

can: replace can_dlc as variable/element for payload length 



The naming of can_dlc as element of struct can_frame and also as variable
name is misleading as it claims to be a 'data length CODE' but in reality
it always was a plain data length.

With the indroduction of a new 'len' element in struct can_frame we can now
remove can_dlc as name and make clear which of the former uses was a plain
length (-> 'len') or a data length code (-> 'dlc') value.

Signed-off-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/r/20201120100444.3199-1-socketcan@hartkopp.net


[mkl: gs_usb: keep struct gs_host_frame::can_dlc as is]
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent cd1124e7

drivers/net/can/at91_can.c

+7 −7
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ static netdev_tx_t at91_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	}

	reg_mid = at91_can_id_to_reg_mid(cf->can_id);

	reg_mcr = ((cf->can_id & CAN_RTR_FLAG) ? AT91_MCR_MRTR : 0) |

		(cf->can_dlc << 16) | AT91_MCR_MTCR;

		(cf->len << 16) | AT91_MCR_MTCR;



	/* disable MB while writing ID (see datasheet) */

	set_mb_mode(priv, mb, AT91_MB_MODE_DISABLED);
@@ -481,7 +481,7 @@ static netdev_tx_t at91_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	/* This triggers transmission */

	at91_write(priv, AT91_MCR(mb), reg_mcr);



	stats->tx_bytes += cf->can_dlc;

	stats->tx_bytes += cf->len;



	/* _NOTE_: subtract AT91_MB_TX_FIRST offset from mb! */

	can_put_echo_skb(skb, dev, mb - get_mb_tx_first(priv));
@@ -554,7 +554,7 @@ static void at91_rx_overflow_err(struct net_device *dev) 
	cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;



	stats->rx_packets++;

	stats->rx_bytes += cf->can_dlc;

	stats->rx_bytes += cf->len;

	netif_receive_skb(skb);

}
@@ -580,7 +580,7 @@ static void at91_read_mb(struct net_device *dev, unsigned int mb, 
		cf->can_id = (reg_mid >> 18) & CAN_SFF_MASK;



	reg_msr = at91_read(priv, AT91_MSR(mb));

	cf->can_dlc = can_cc_dlc2len((reg_msr >> 16) & 0xf);

	cf->len = can_cc_dlc2len((reg_msr >> 16) & 0xf);



	if (reg_msr & AT91_MSR_MRTR)

		cf->can_id |= CAN_RTR_FLAG;
@@ -619,7 +619,7 @@ static void at91_read_msg(struct net_device *dev, unsigned int mb) 
	at91_read_mb(dev, mb, cf);



	stats->rx_packets++;

	stats->rx_bytes += cf->can_dlc;

	stats->rx_bytes += cf->len;

	netif_receive_skb(skb);



	can_led_event(dev, CAN_LED_EVENT_RX);
@@ -780,7 +780,7 @@ static int at91_poll_err(struct net_device *dev, int quota, u32 reg_sr) 
	at91_poll_err_frame(dev, cf, reg_sr);



	dev->stats.rx_packets++;

	dev->stats.rx_bytes += cf->can_dlc;

	dev->stats.rx_bytes += cf->len;

	netif_receive_skb(skb);



	return 1;
@@ -1047,7 +1047,7 @@ static void at91_irq_err(struct net_device *dev) 
	at91_irq_err_state(dev, cf, new_state);



	dev->stats.rx_packets++;

	dev->stats.rx_bytes += cf->can_dlc;

	dev->stats.rx_bytes += cf->len;

	netif_rx(skb);



	priv->can.state = new_state;

drivers/net/can/c_can/c_can.c

+10 −10
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ static void c_can_setup_tx_object(struct net_device *dev, int iface, 
				  struct can_frame *frame, int idx)

{

	struct c_can_priv *priv = netdev_priv(dev);

	u16 ctrl = IF_MCONT_TX | frame->can_dlc;

	u16 ctrl = IF_MCONT_TX | frame->len;

	bool rtr = frame->can_id & CAN_RTR_FLAG;

	u32 arb = IF_ARB_MSGVAL;

	int i;
@@ -339,7 +339,7 @@ static void c_can_setup_tx_object(struct net_device *dev, int iface, 
	if (priv->type == BOSCH_D_CAN) {

		u32 data = 0, dreg = C_CAN_IFACE(DATA1_REG, iface);



		for (i = 0; i < frame->can_dlc; i += 4, dreg += 2) {

		for (i = 0; i < frame->len; i += 4, dreg += 2) {

			data = (u32)frame->data[i];

			data |= (u32)frame->data[i + 1] << 8;

			data |= (u32)frame->data[i + 2] << 16;
@@ -347,7 +347,7 @@ static void c_can_setup_tx_object(struct net_device *dev, int iface, 
			priv->write_reg32(priv, dreg, data);

		}

	} else {

		for (i = 0; i < frame->can_dlc; i += 2) {

		for (i = 0; i < frame->len; i += 2) {

			priv->write_reg(priv,

					C_CAN_IFACE(DATA1_REG, iface) + i / 2,

					frame->data[i] |
@@ -397,7 +397,7 @@ static int c_can_read_msg_object(struct net_device *dev, int iface, u32 ctrl) 
		return -ENOMEM;

	}



	frame->can_dlc = can_cc_dlc2len(ctrl & 0x0F);

	frame->len = can_cc_dlc2len(ctrl & 0x0F);



	arb = priv->read_reg32(priv, C_CAN_IFACE(ARB1_REG, iface));
@@ -412,7 +412,7 @@ static int c_can_read_msg_object(struct net_device *dev, int iface, u32 ctrl) 
		int i, dreg = C_CAN_IFACE(DATA1_REG, iface);



		if (priv->type == BOSCH_D_CAN) {

			for (i = 0; i < frame->can_dlc; i += 4, dreg += 2) {

			for (i = 0; i < frame->len; i += 4, dreg += 2) {

				data = priv->read_reg32(priv, dreg);

				frame->data[i] = data;

				frame->data[i + 1] = data >> 8;
@@ -420,7 +420,7 @@ static int c_can_read_msg_object(struct net_device *dev, int iface, u32 ctrl) 
				frame->data[i + 3] = data >> 24;

			}

		} else {

			for (i = 0; i < frame->can_dlc; i += 2, dreg++) {

			for (i = 0; i < frame->len; i += 2, dreg++) {

				data = priv->read_reg(priv, dreg);

				frame->data[i] = data;

				frame->data[i + 1] = data >> 8;
@@ -429,7 +429,7 @@ static int c_can_read_msg_object(struct net_device *dev, int iface, u32 ctrl) 
	}



	stats->rx_packets++;

	stats->rx_bytes += frame->can_dlc;

	stats->rx_bytes += frame->len;



	netif_receive_skb(skb);

	return 0;
@@ -475,7 +475,7 @@ static netdev_tx_t c_can_start_xmit(struct sk_buff *skb, 
	 * transmit as we might race against do_tx().

	 */

	c_can_setup_tx_object(dev, IF_TX, frame, idx);

	priv->dlc[idx] = frame->can_dlc;

	priv->dlc[idx] = frame->len;

	can_put_echo_skb(skb, dev, idx);



	/* Update the active bits */
@@ -977,7 +977,7 @@ static int c_can_handle_state_change(struct net_device *dev, 
	}



	stats->rx_packets++;

	stats->rx_bytes += cf->can_dlc;

	stats->rx_bytes += cf->len;

	netif_receive_skb(skb);



	return 1;
@@ -1047,7 +1047,7 @@ static int c_can_handle_bus_err(struct net_device *dev, 
	}



	stats->rx_packets++;

	stats->rx_bytes += cf->can_dlc;

	stats->rx_bytes += cf->len;

	netif_receive_skb(skb);

	return 1;

}

drivers/net/can/cc770/cc770.c

+7 −7
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static void cc770_tx(struct net_device *dev, int mo) 
	u32 id;

	int i;



	dlc = cf->can_dlc;

	dlc = cf->len;

	id = cf->can_id;

	rtr = cf->can_id & CAN_RTR_FLAG ? 0 : MSGCFG_DIR;
@@ -470,7 +470,7 @@ static void cc770_rx(struct net_device *dev, unsigned int mo, u8 ctrl1) 
		cf->can_id = CAN_RTR_FLAG;

		if (config & MSGCFG_XTD)

			cf->can_id |= CAN_EFF_FLAG;

		cf->can_dlc = 0;

		cf->len = 0;

	} else {

		if (config & MSGCFG_XTD) {

			id = cc770_read_reg(priv, msgobj[mo].id[3]);
@@ -486,13 +486,13 @@ static void cc770_rx(struct net_device *dev, unsigned int mo, u8 ctrl1) 
		}



		cf->can_id = id;

		cf->can_dlc = can_cc_dlc2len((config & 0xf0) >> 4);

		for (i = 0; i < cf->can_dlc; i++)

		cf->len = can_cc_dlc2len((config & 0xf0) >> 4);

		for (i = 0; i < cf->len; i++)

			cf->data[i] = cc770_read_reg(priv, msgobj[mo].data[i]);

	}



	stats->rx_packets++;

	stats->rx_bytes += cf->can_dlc;

	stats->rx_bytes += cf->len;

	netif_rx(skb);

}
@@ -572,7 +572,7 @@ static int cc770_err(struct net_device *dev, u8 status) 




	stats->rx_packets++;

	stats->rx_bytes += cf->can_dlc;

	stats->rx_bytes += cf->len;

	netif_rx(skb);



	return 0;
@@ -699,7 +699,7 @@ static void cc770_tx_interrupt(struct net_device *dev, unsigned int o) 
	}



	cf = (struct can_frame *)priv->tx_skb->data;

	stats->tx_bytes += cf->can_dlc;

	stats->tx_bytes += cf->len;

	stats->tx_packets++;



	can_put_echo_skb(priv->tx_skb, dev, 0);

drivers/net/can/dev.c

+5 −5
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ MODULE_AUTHOR("Wolfgang Grandegger <wg@grandegger.com>"); 
static const u8 dlc2len[] = {0, 1, 2, 3, 4, 5, 6, 7,

			     8, 12, 16, 20, 24, 32, 48, 64};



/* get data length from can_dlc with sanitized can_dlc */

u8 can_dlc2len(u8 can_dlc)

/* get data length from raw data length code (DLC) */

u8 can_dlc2len(u8 dlc)

{

	return dlc2len[can_dlc & 0x0F];

	return dlc2len[dlc & 0x0F];

}

EXPORT_SYMBOL_GPL(can_dlc2len);
@@ -595,7 +595,7 @@ static void can_restart(struct net_device *dev) 
	netif_rx_ni(skb);



	stats->rx_packets++;

	stats->rx_bytes += cf->can_dlc;

	stats->rx_bytes += cf->len;



restart:

	netdev_dbg(dev, "restarted\n");
@@ -737,7 +737,7 @@ struct sk_buff *alloc_can_err_skb(struct net_device *dev, struct can_frame **cf) 
		return NULL;



	(*cf)->can_id = CAN_ERR_FLAG;

	(*cf)->can_dlc = CAN_ERR_DLC;

	(*cf)->len = CAN_ERR_DLC;



	return skb;

}

drivers/net/can/grcan.c

+5 −5
Original line number Diff line number Diff line
@@ -1201,12 +1201,12 @@ static int grcan_receive(struct net_device *dev, int budget) 
			cf->can_id = ((slot[0] & GRCAN_MSG_BID)

				      >> GRCAN_MSG_BID_BIT);

		}

		cf->can_dlc = can_cc_dlc2len((slot[1] & GRCAN_MSG_DLC)

		cf->len = can_cc_dlc2len((slot[1] & GRCAN_MSG_DLC)

					  >> GRCAN_MSG_DLC_BIT);

		if (rtr) {

			cf->can_id |= CAN_RTR_FLAG;

		} else {

			for (i = 0; i < cf->can_dlc; i++) {

			for (i = 0; i < cf->len; i++) {

				j = GRCAN_MSG_DATA_SLOT_INDEX(i);

				shift = GRCAN_MSG_DATA_SHIFT(i);

				cf->data[i] = (u8)(slot[j] >> shift);
@@ -1215,7 +1215,7 @@ static int grcan_receive(struct net_device *dev, int budget) 


		/* Update statistics and read pointer */

		stats->rx_packets++;

		stats->rx_bytes += cf->can_dlc;

		stats->rx_bytes += cf->len;

		netif_receive_skb(skb);



		rd = grcan_ring_add(rd, GRCAN_MSG_SIZE, dma->rx.size);
@@ -1399,7 +1399,7 @@ static netdev_tx_t grcan_start_xmit(struct sk_buff *skb, 
	eff = cf->can_id & CAN_EFF_FLAG;

	rtr = cf->can_id & CAN_RTR_FLAG;

	id = cf->can_id & (eff ? CAN_EFF_MASK : CAN_SFF_MASK);

	dlc = cf->can_dlc;

	dlc = cf->len;

	if (eff)

		tmp = (id << GRCAN_MSG_EID_BIT) & GRCAN_MSG_EID;

	else
@@ -1447,7 +1447,7 @@ static netdev_tx_t grcan_start_xmit(struct sk_buff *skb, 
	 * can_put_echo_skb would be an error unless other measures are

	 * taken.

	 */

	priv->txdlc[slotindex] = cf->can_dlc; /* Store dlc for statistics */

	priv->txdlc[slotindex] = cf->len; /* Store dlc for statistics */

	can_put_echo_skb(skb, dev, slotindex);



	/* Make sure everything is written before allowing hardware to