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

Commit 511044ea authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: remove a few set but unused variables 



Found by compiling with W=1.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6d10e46b

net/mac80211/main.c

+0 −4
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ static u32 ieee80211_hw_conf_chan(struct ieee80211_local *local) 
	int power;

	enum nl80211_channel_type channel_type;

	u32 offchannel_flag;

	bool scanning = false;



	offchannel_flag = local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL;

	if (local->scan_channel) {
@@ -147,9 +146,6 @@ static u32 ieee80211_hw_conf_chan(struct ieee80211_local *local) 
		changed |= IEEE80211_CONF_CHANGE_SMPS;

	}



	scanning = test_bit(SCAN_SW_SCANNING, &local->scanning) ||

		   test_bit(SCAN_ONCHANNEL_SCANNING, &local->scanning) ||

		   test_bit(SCAN_HW_SCANNING, &local->scanning);

	power = chan->max_power;



	rcu_read_lock();

net/mac80211/mesh.c

+1 −4
Original line number Diff line number Diff line
@@ -699,10 +699,8 @@ out_free: 
static int

ieee80211_mesh_rebuild_beacon(struct ieee80211_if_mesh *ifmsh)

{

	struct ieee80211_sub_if_data *sdata;

	struct beacon_data *old_bcn;

	int ret;

	sdata = container_of(ifmsh, struct ieee80211_sub_if_data, u.mesh);



	mutex_lock(&ifmsh->mtx);
@@ -833,9 +831,8 @@ ieee80211_mesh_rx_probe_req(struct ieee80211_sub_if_data *sdata, 
	struct ieee80211_mgmt *hdr;

	struct ieee802_11_elems elems;

	size_t baselen;

	u8 *pos, *end;

	u8 *pos;



	end = ((u8 *) mgmt) + len;

	pos = mgmt->u.probe_req.variable;

	baselen = (u8 *) pos - (u8 *) mgmt;

	if (baselen > len)

net/mac80211/scan.c

+0 −3
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ void ieee80211_scan_rx(struct ieee80211_local *local, struct sk_buff *skb) 
	u8 *elements;

	struct ieee80211_channel *channel;

	size_t baselen;

	bool beacon;

	struct ieee802_11_elems elems;



	if (skb->len < 24 ||
@@ -175,11 +174,9 @@ void ieee80211_scan_rx(struct ieee80211_local *local, struct sk_buff *skb) 


		elements = mgmt->u.probe_resp.variable;

		baselen = offsetof(struct ieee80211_mgmt, u.probe_resp.variable);

		beacon = false;

	} else {

		baselen = offsetof(struct ieee80211_mgmt, u.beacon.variable);

		elements = mgmt->u.beacon.variable;

		beacon = true;

	}



	if (baselen > skb->len)