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

Commit b7116576 authored by Christophe Jaillet's avatar Christophe Jaillet Committed by Kalle Valo
Browse files

mwifiex: scan: Simplify code 



This patch:
   - improves code layout
   - removes a useless memset(0) for some memory allocated with kzalloc
   - removes a useless if. We know that 'if (chan_band_tlv)' will succeed
     because it has been tested a few lines above

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 4c5dae59

drivers/net/wireless/marvell/mwifiex/scan.c

+4 −8
Original line number Diff line number Diff line
@@ -2194,18 +2194,14 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv, 


		if (chan_band_tlv && adapter->nd_info) {

			adapter->nd_info->matches[idx] =

				kzalloc(sizeof(*pmatch) +

				sizeof(u32), GFP_ATOMIC);

				kzalloc(sizeof(*pmatch) + sizeof(u32),

					GFP_ATOMIC);



			pmatch = adapter->nd_info->matches[idx];



			if (pmatch) {

				memset(pmatch, 0, sizeof(*pmatch));

				if (chan_band_tlv) {

				pmatch->n_channels = 1;

					pmatch->channels[0] =

						chan_band->chan_number;

				}

				pmatch->channels[0] = chan_band->chan_number;

			}

		}