UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mac80211: remove a few set but unused variables 

Found by compiling with W=1.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2013-03-07 22:47:00 +01:00
parent 6d10e46be5
commit 511044ea0b
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/main.c
View File

@ -100,7 +100,6 @@ static u32 ieee80211_hw_conf_chan(struct ieee80211_local *local)
int power; int power;
enum nl80211_channel_type channel_type; enum nl80211_channel_type channel_type;
u32 offchannel_flag; u32 offchannel_flag;
bool scanning = false;
offchannel_flag = local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL; offchannel_flag = local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL;
if (local->scan_channel) { if (local->scan_channel) {
@ -147,9 +146,6 @@ static u32 ieee80211_hw_conf_chan(struct ieee80211_local *local)
changed |= IEEE80211_CONF_CHANGE_SMPS; 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; power = chan->max_power;
rcu_read_lock(); rcu_read_lock();

5
net/mac80211/mesh.c
View File

@ -699,10 +699,8 @@ out_free:
static int static int
ieee80211_mesh_rebuild_beacon(struct ieee80211_if_mesh *ifmsh) ieee80211_mesh_rebuild_beacon(struct ieee80211_if_mesh *ifmsh)
{ {
struct ieee80211_sub_if_data *sdata;
struct beacon_data *old_bcn; struct beacon_data *old_bcn;
int ret; int ret;
sdata = container_of(ifmsh, struct ieee80211_sub_if_data, u.mesh);
mutex_lock(&ifmsh->mtx); mutex_lock(&ifmsh->mtx);
@ -833,9 +831,8 @@ ieee80211_mesh_rx_probe_req(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *hdr; struct ieee80211_mgmt *hdr;
struct ieee802_11_elems elems; struct ieee802_11_elems elems;
size_t baselen; size_t baselen;
u8 *pos, *end; u8 *pos;
end = ((u8 *) mgmt) + len;
pos = mgmt->u.probe_req.variable; pos = mgmt->u.probe_req.variable;
baselen = (u8 *) pos - (u8 *) mgmt; baselen = (u8 *) pos - (u8 *) mgmt;
if (baselen > len) if (baselen > len)

3
net/mac80211/scan.c
View File

@ -153,7 +153,6 @@ void ieee80211_scan_rx(struct ieee80211_local *local, struct sk_buff *skb)
u8 *elements; u8 *elements;
struct ieee80211_channel *channel; struct ieee80211_channel *channel;
size_t baselen; size_t baselen;
bool beacon;
struct ieee802_11_elems elems; struct ieee802_11_elems elems;
if (skb->len < 24 || 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; elements = mgmt->u.probe_resp.variable;
baselen = offsetof(struct ieee80211_mgmt, u.probe_resp.variable); baselen = offsetof(struct ieee80211_mgmt, u.probe_resp.variable);
beacon = false;
} else { } else {
baselen = offsetof(struct ieee80211_mgmt, u.beacon.variable); baselen = offsetof(struct ieee80211_mgmt, u.beacon.variable);
elements = mgmt->u.beacon.variable; elements = mgmt->u.beacon.variable;
beacon = true;
} }
if (baselen > skb->len) if (baselen > skb->len)