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

Commit 8ac1101f authored by Inaky Perez-Gonzalez's avatar Inaky Perez-Gonzalez
Browse files

wimax/i2400m: factor out 'state report's TLV handling to a function 



i2400m_report_state_hook() is going to get messier as we add handling
code.

Signed-off-by: default avatarInaky Perez-Gonzalez <inaky@linux.intel.com>
parent 223beea2

drivers/net/wimax/i2400m/control.c

+50 −39
Original line number Diff line number Diff line
@@ -400,43 +400,26 @@ void i2400m_report_tlv_media_status(struct i2400m *i2400m, 




/*

 * Parse a 'state report' and extract carrier on/off information

 * Process a TLV from a 'state report'

 *

 * @i2400m: device descriptor

 * @l3l4_hdr: pointer to message; it has been already validated for

 * @tlv: pointer to the TLV header; it has been already validated for

 *     consistent size.

 * @size: size of the message (header + payload). The header length

 *        declaration is assumed to be congruent with @size (as in

 *        sizeof(*l3l4_hdr) + l3l4_hdr->length == size)

 *

 * Extract from the report state the system state TLV and infer from

 * there if we have a carrier or not. Update our local state and tell

 * netdev.

 * @tag: for error messages

 *

 * When setting the carrier, it's fine to set OFF twice (for example),

 * as netif_carrier_off() will not generate two OFF events (just on

 * the transitions).

 * Act on the TLVs from a 'state report'.

 */

static

void i2400m_report_state_hook(struct i2400m *i2400m,

			      const struct i2400m_l3l4_hdr *l3l4_hdr,

			      size_t size, const char *tag)

void i2400m_report_state_parse_tlv(struct i2400m *i2400m,

				   const struct i2400m_tlv_hdr *tlv,

				   const char *tag)

{

	struct device *dev = i2400m_dev(i2400m);

	const struct i2400m_tlv_hdr *tlv;

	const struct i2400m_tlv_media_status *ms;

	const struct i2400m_tlv_system_state *ss;

	const struct i2400m_tlv_rf_switches_status *rfss;

	const struct i2400m_tlv_media_status *ms;

	size_t tlv_size = le16_to_cpu(l3l4_hdr->length);



	d_fnstart(4, dev, "(i2400m %p, l3l4_hdr %p, size %zu, %s)\n",

		  i2400m, l3l4_hdr, size, tag);

	tlv = NULL;



	while ((tlv = i2400m_tlv_buffer_walk(i2400m, &l3l4_hdr->pl,

					     tlv_size, tlv))) {

		if (0 == i2400m_tlv_match(tlv, I2400M_TLV_SYSTEM_STATE,

					  sizeof(*ss))) {

	if (0 == i2400m_tlv_match(tlv, I2400M_TLV_SYSTEM_STATE, sizeof(*ss))) {

		ss = container_of(tlv, typeof(*ss), hdr);

		d_printf(2, dev, "%s: system state TLV "

			 "found (0x%04x), state 0x%08x\n",
@@ -444,8 +427,7 @@ void i2400m_report_state_hook(struct i2400m *i2400m, 
			 le32_to_cpu(ss->state));

		i2400m_report_tlv_system_state(i2400m, ss);

	}

		if (0 == i2400m_tlv_match(tlv, I2400M_TLV_RF_STATUS,

					  sizeof(*rfss))) {

	if (0 == i2400m_tlv_match(tlv, I2400M_TLV_RF_STATUS, sizeof(*rfss))) {

		rfss = container_of(tlv, typeof(*rfss), hdr);

		d_printf(2, dev, "%s: RF status TLV "

			 "found (0x%04x), sw 0x%02x hw 0x%02x\n",
@@ -454,14 +436,43 @@ void i2400m_report_state_hook(struct i2400m *i2400m, 
			 le32_to_cpu(rfss->hw_rf_switch));

		i2400m_report_tlv_rf_switches_status(i2400m, rfss);

	}

		if (0 == i2400m_tlv_match(tlv, I2400M_TLV_MEDIA_STATUS,

					  sizeof(*ms))) {

	if (0 == i2400m_tlv_match(tlv, I2400M_TLV_MEDIA_STATUS, sizeof(*ms))) {

		ms = container_of(tlv, typeof(*ms), hdr);

		d_printf(2, dev, "%s: Media Status TLV: %u\n",

			 tag, le32_to_cpu(ms->media_status));

		i2400m_report_tlv_media_status(i2400m, ms);

	}

}





/*

 * Parse a 'state report' and extract information

 *

 * @i2400m: device descriptor

 * @l3l4_hdr: pointer to message; it has been already validated for

 *            consistent size.

 * @size: size of the message (header + payload). The header length

 *        declaration is assumed to be congruent with @size (as in

 *        sizeof(*l3l4_hdr) + l3l4_hdr->length == size)

 *

 * Walk over the TLVs in a report state and act on them.

 */

static

void i2400m_report_state_hook(struct i2400m *i2400m,

			      const struct i2400m_l3l4_hdr *l3l4_hdr,

			      size_t size, const char *tag)

{

	struct device *dev = i2400m_dev(i2400m);

	const struct i2400m_tlv_hdr *tlv;

	size_t tlv_size = le16_to_cpu(l3l4_hdr->length);



	d_fnstart(4, dev, "(i2400m %p, l3l4_hdr %p, size %zu, %s)\n",

		  i2400m, l3l4_hdr, size, tag);

	tlv = NULL;



	while ((tlv = i2400m_tlv_buffer_walk(i2400m, &l3l4_hdr->pl,

					     tlv_size, tlv)))

		i2400m_report_state_parse_tlv(i2400m, tlv, tag);

	d_fnend(4, dev, "(i2400m %p, l3l4_hdr %p, size %zu, %s) = void\n",

		i2400m, l3l4_hdr, size, tag);

}