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

Commit 0a0dac38 authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: fix line over 80 char for cfg parse RX and TX function 



Fix 'line over 80 characters' issue found by checkpatch.pl script. Moved
the common code from wilc_wfi_cfg_parse_tx_action() &
wilc_wfi_cfg_parse_rx_action() to new function to avoid checkpatch issue.

Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6fa02f2d

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+32 −35
Original line number Diff line number Diff line
@@ -1337,10 +1337,33 @@ static int flush_pmksa(struct wiphy *wiphy, struct net_device *netdev) 
	return 0;

}



static inline void wilc_wfi_cfg_parse_ch_attr(u8 *buf, u8 ch_list_attr_idx,

					      u8 op_ch_attr_idx)

{

	int i = 0;

	int j = 0;



	if (ch_list_attr_idx) {

		u8 limit = ch_list_attr_idx + 3 + buf[ch_list_attr_idx + 1];



		for (i = ch_list_attr_idx + 3; i < limit; i++) {

			if (buf[i] == 0x51) {

				for (j = i + 2; j < ((i + 2) + buf[i + 1]); j++)

					buf[j] = wlan_channel;

				break;

			}

		}

	}



	if (op_ch_attr_idx) {

		buf[op_ch_attr_idx + 6] = 0x51;

		buf[op_ch_attr_idx + 7] = wlan_channel;

	}

}



static void wilc_wfi_cfg_parse_rx_action(u8 *buf, u32 len)

{

	u32 index = 0;

	u32 i = 0, j = 0;



	u8 op_channel_attr_index = 0;

	u8 channel_list_attr_index = 0;
@@ -1355,28 +1378,15 @@ static void wilc_wfi_cfg_parse_rx_action(u8 *buf, u32 len) 
			op_channel_attr_index = index;

		index += buf[index + 1] + 3;

	}

	if (wlan_channel != INVALID_CHANNEL) {

		if (channel_list_attr_index) {

			for (i = channel_list_attr_index + 3; i < ((channel_list_attr_index + 3) + buf[channel_list_attr_index + 1]); i++) {

				if (buf[i] == 0x51) {

					for (j = i + 2; j < ((i + 2) + buf[i + 1]); j++)

						buf[j] = wlan_channel;

					break;

				}

			}

	if (wlan_channel != INVALID_CHANNEL)

		wilc_wfi_cfg_parse_ch_attr(buf, channel_list_attr_index,

					   op_channel_attr_index);

}



		if (op_channel_attr_index) {

			buf[op_channel_attr_index + 6] = 0x51;

			buf[op_channel_attr_index + 7] = wlan_channel;

		}

	}

}



static void wilc_wfi_cfg_parse_tx_action(u8 *buf, u32 len, bool oper_ch, u8 iftype)

static void wilc_wfi_cfg_parse_tx_action(u8 *buf, u32 len, bool oper_ch,

					 u8 iftype)

{

	u32 index = 0;

	u32 i = 0, j = 0;



	u8 op_channel_attr_index = 0;

	u8 channel_list_attr_index = 0;
@@ -1394,22 +1404,9 @@ static void wilc_wfi_cfg_parse_tx_action(u8 *buf, u32 len, bool oper_ch, u8 ifty 
			op_channel_attr_index = index;

		index += buf[index + 1] + 3;

	}

	if (wlan_channel != INVALID_CHANNEL && oper_ch) {

		if (channel_list_attr_index) {

			for (i = channel_list_attr_index + 3; i < ((channel_list_attr_index + 3) + buf[channel_list_attr_index + 1]); i++) {

				if (buf[i] == 0x51) {

					for (j = i + 2; j < ((i + 2) + buf[i + 1]); j++)

						buf[j] = wlan_channel;

					break;

				}

			}

		}



		if (op_channel_attr_index) {

			buf[op_channel_attr_index + 6] = 0x51;

			buf[op_channel_attr_index + 7] = wlan_channel;

		}

	}

	if (wlan_channel != INVALID_CHANNEL && oper_ch)

		wilc_wfi_cfg_parse_ch_attr(buf, channel_list_attr_index,

					   op_channel_attr_index);

}



void WILC_WFI_p2p_rx(struct net_device *dev, u8 *buff, u32 size)