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

Commit d2c7f773 authored by Pavel Roskin's avatar Pavel Roskin Committed by John W. Linville
Browse files

ath5k: fix misplaced or extraneous braces found by checkpatch.pl 



Signed-off-by: default avatarPavel Roskin <proski@gnu.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 633d006e

drivers/net/wireless/ath/ath5k/ath5k.h

+1 −2
Original line number Diff line number Diff line
@@ -1011,8 +1011,7 @@ struct ath5k_capabilities { 


/* size of noise floor history (keep it a power of two) */

#define ATH5K_NF_CAL_HIST_MAX	8

struct ath5k_nfcal_hist

{

struct ath5k_nfcal_hist {

	s16 index;				/* current index into nfval */

	s16 nfval[ATH5K_NF_CAL_HIST_MAX];	/* last few noise floors */

};

drivers/net/wireless/ath/ath5k/base.c

+6 −8
Original line number Diff line number Diff line
@@ -1265,12 +1265,11 @@ static int ath5k_common_padpos(struct sk_buff *skb) 
	__le16 frame_control = hdr->frame_control;

	int padpos = 24;



	if (ieee80211_has_a4(frame_control)) {

	if (ieee80211_has_a4(frame_control))

		padpos += ETH_ALEN;

	}

	if (ieee80211_is_data_qos(frame_control)) {



	if (ieee80211_is_data_qos(frame_control))

		padpos += IEEE80211_QOS_CTL_LEN;

	}



	return padpos;

}
@@ -2199,13 +2198,12 @@ ath5k_intr(int irq, void *dev_id) 
				ATH5K_DBG(sc, ATH5K_DEBUG_RESET,

					  "rx overrun, resetting\n");

				ieee80211_queue_work(sc->hw, &sc->reset_work);

			}

			else

			} else

				ath5k_schedule_rx(sc);

		} else {

			if (status & AR5K_INT_SWBA) {

			if (status & AR5K_INT_SWBA)

				tasklet_hi_schedule(&sc->beacontq);

			}



			if (status & AR5K_INT_RXEOL) {

				/*

				* NB: the hardware should re-read the link when

drivers/net/wireless/ath/ath5k/base.h

+1 −2
Original line number Diff line number Diff line
@@ -96,8 +96,7 @@ struct ath5k_txq { 
/*

 * State for LED triggers

 */

struct ath5k_led

{

struct ath5k_led {

	char name[ATH5K_LED_MAX_NAME_LEN + 1];	/* name of the LED in sysfs */

	struct ath5k_softc *sc;			/* driver state */

	struct led_classdev led_dev;		/* led classdev */

drivers/net/wireless/ath/ath5k/eeprom.c

+6 −4
Original line number Diff line number Diff line
@@ -644,10 +644,12 @@ ath5k_eeprom_init_11bg_2413(struct ath5k_hw *ah, unsigned int mode, int offset) 
static inline void

ath5k_get_pcdac_intercepts(struct ath5k_hw *ah, u8 min, u8 max, u8 *vp)

{

	static const u16 intercepts3[] =

		{ 0, 5, 10, 20, 30, 50, 70, 85, 90, 95, 100 };

	static const u16 intercepts3_2[] =

		{ 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100 };

	static const u16 intercepts3[] = {

		0, 5, 10, 20, 30, 50, 70, 85, 90, 95, 100

	};

	static const u16 intercepts3_2[] = {

		0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100

	};

	const u16 *ip;

	int i;