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

Commit 0915cba3 authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by John W. Linville
Browse files

mac80211: Fix warnings due to -Wunused-but-set-variable 



These warnings are exposed by gcc 4.6.
net/mac80211/sta_info.c: In function 'sta_info_cleanup_expire_buffered':
net/mac80211/sta_info.c:590:32: warning: variable 'sdata' set but not used
net/mac80211/ibss.c: In function 'ieee80211_rx_mgmt_auth_ibss':
net/mac80211/ibss.c:43:34: warning: variable 'status_code' set but not used
net/mac80211/work.c: In function 'ieee80211_send_assoc':
net/mac80211/work.c:203:9: warning: variable 'len' set but not used
net/mac80211/tx.c: In function '__ieee80211_parse_tx_radiotap':
net/mac80211/tx.c:1039:35: warning: variable 'sband' set but not used
net/mac80211/mesh.c: In function 'ieee80211_mesh_rx_queued_mgmt':
net/mac80211/mesh.c:616:28: warning: variable 'ifmsh' set but not used
 ...

Signed-off-by: default avatarRajkumar Manoharan <rmanoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 334df731

net/mac80211/aes_ccm.c

+2 −4
Original line number Diff line number Diff line
@@ -54,13 +54,12 @@ void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *scratch, 
			       u8 *cdata, u8 *mic)

{

	int i, j, last_len, num_blocks;

	u8 *pos, *cpos, *b, *s_0, *e, *b_0, *aad;

	u8 *pos, *cpos, *b, *s_0, *e, *b_0;



	b = scratch;

	s_0 = scratch + AES_BLOCK_LEN;

	e = scratch + 2 * AES_BLOCK_LEN;

	b_0 = scratch + 3 * AES_BLOCK_LEN;

	aad = scratch + 4 * AES_BLOCK_LEN;



	num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_LEN);

	last_len = data_len % AES_BLOCK_LEN;
@@ -94,13 +93,12 @@ int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *scratch, 
			      u8 *cdata, size_t data_len, u8 *mic, u8 *data)

{

	int i, j, last_len, num_blocks;

	u8 *pos, *cpos, *b, *s_0, *a, *b_0, *aad;

	u8 *pos, *cpos, *b, *s_0, *a, *b_0;



	b = scratch;

	s_0 = scratch + AES_BLOCK_LEN;

	a = scratch + 2 * AES_BLOCK_LEN;

	b_0 = scratch + 3 * AES_BLOCK_LEN;

	aad = scratch + 4 * AES_BLOCK_LEN;



	num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_LEN);

	last_len = data_len % AES_BLOCK_LEN;

net/mac80211/ibss.c

+1 −6
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata, 
					struct ieee80211_mgmt *mgmt,

					size_t len)

{

	u16 auth_alg, auth_transaction, status_code;

	u16 auth_alg, auth_transaction;



	lockdep_assert_held(&sdata->u.ibss.mtx);
@@ -49,7 +49,6 @@ static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata, 


	auth_alg = le16_to_cpu(mgmt->u.auth.auth_alg);

	auth_transaction = le16_to_cpu(mgmt->u.auth.auth_transaction);

	status_code = le16_to_cpu(mgmt->u.auth.status_code);



	/*

	 * IEEE 802.11 standard does not require authentication in IBSS
@@ -527,8 +526,6 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata) 
static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)

{

	struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_supported_band *sband;

	u8 bssid[ETH_ALEN];

	u16 capability;

	int i;
@@ -551,8 +548,6 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata) 
	printk(KERN_DEBUG "%s: Creating new IBSS network, BSSID %pM\n",

	       sdata->name, bssid);



	sband = local->hw.wiphy->bands[ifibss->channel->band];



	capability = WLAN_CAPABILITY_IBSS;



	if (ifibss->privacy)

net/mac80211/mesh.c

+0 −3
Original line number Diff line number Diff line
@@ -613,12 +613,9 @@ void ieee80211_mesh_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, 
				   struct sk_buff *skb)

{

	struct ieee80211_rx_status *rx_status;

	struct ieee80211_if_mesh *ifmsh;

	struct ieee80211_mgmt *mgmt;

	u16 stype;



	ifmsh = &sdata->u.mesh;



	rx_status = IEEE80211_SKB_RXCB(skb);

	mgmt = (struct ieee80211_mgmt *) skb->data;

	stype = le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE;

net/mac80211/mesh_hwmp.c

+0 −4
Original line number Diff line number Diff line
@@ -633,7 +633,6 @@ static void hwmp_perr_frame_process(struct ieee80211_sub_if_data *sdata, 
	struct mesh_path *mpath;

	u8 ttl;

	u8 *ta, *target_addr;

	u8 target_flags;

	u32 target_sn;

	u16 target_rcode;
@@ -644,7 +643,6 @@ static void hwmp_perr_frame_process(struct ieee80211_sub_if_data *sdata, 
		return;

	}

	ttl--;

	target_flags = PERR_IE_TARGET_FLAGS(perr_elem);

	target_addr = PERR_IE_TARGET_ADDR(perr_elem);

	target_sn = PERR_IE_TARGET_SN(perr_elem);

	target_rcode = PERR_IE_TARGET_RCODE(perr_elem);
@@ -675,12 +673,10 @@ static void hwmp_rann_frame_process(struct ieee80211_sub_if_data *sdata, 
{

	struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;

	struct mesh_path *mpath;

	u8 *ta;

	u8 ttl, flags, hopcount;

	u8 *orig_addr;

	u32 orig_sn, metric;



	ta = mgmt->sa;

	ttl = rann->rann_ttl;

	if (ttl <= 1) {

		ifmsh->mshstats.dropped_frames_ttl++;

net/mac80211/sta_info.c

+0 −2
Original line number Diff line number Diff line
@@ -587,7 +587,6 @@ static bool sta_info_cleanup_expire_buffered(struct ieee80211_local *local, 
{

	unsigned long flags;

	struct sk_buff *skb;

	struct ieee80211_sub_if_data *sdata;



	if (skb_queue_empty(&sta->ps_tx_buf))

		return false;
@@ -604,7 +603,6 @@ static bool sta_info_cleanup_expire_buffered(struct ieee80211_local *local, 
		if (!skb)

			break;



		sdata = sta->sdata;

		local->total_ps_buffered--;

#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG

		printk(KERN_DEBUG "Buffered frame expired (STA %pM)\n",