nl80211: remove some stack variables in trigger_scan and start_sched_scan
Some stack variables (name *ssid and *channel) are only used to define the size of the memory block that needs to be allocated for the request structure in the nl80211_trigger_scan() and nl80211_start_sched_scan() functions. This is unnecessary because the sizes of the actual elements in the structure can be used instead. Signed-off-by: Luciano Coelho <coelho@ti.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
d676ff493d
commit
a2cd43c52a
|
@ -3294,8 +3294,6 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)
|
|||
struct cfg80211_registered_device *rdev = info->user_ptr[0];
|
||||
struct net_device *dev = info->user_ptr[1];
|
||||
struct cfg80211_scan_request *request;
|
||||
struct cfg80211_ssid *ssid;
|
||||
struct ieee80211_channel *channel;
|
||||
struct nlattr *attr;
|
||||
struct wiphy *wiphy;
|
||||
int err, tmp, n_ssids = 0, n_channels, i;
|
||||
|
@ -3342,8 +3340,8 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)
|
|||
return -EINVAL;
|
||||
|
||||
request = kzalloc(sizeof(*request)
|
||||
+ sizeof(*ssid) * n_ssids
|
||||
+ sizeof(channel) * n_channels
|
||||
+ sizeof(*request->ssids) * n_ssids
|
||||
+ sizeof(*request->channels) * n_channels
|
||||
+ ie_len, GFP_KERNEL);
|
||||
if (!request)
|
||||
return -ENOMEM;
|
||||
|
@ -3449,8 +3447,6 @@ static int nl80211_start_sched_scan(struct sk_buff *skb,
|
|||
struct cfg80211_sched_scan_request *request;
|
||||
struct cfg80211_registered_device *rdev = info->user_ptr[0];
|
||||
struct net_device *dev = info->user_ptr[1];
|
||||
struct cfg80211_ssid *ssid;
|
||||
struct ieee80211_channel *channel;
|
||||
struct nlattr *attr;
|
||||
struct wiphy *wiphy;
|
||||
int err, tmp, n_ssids = 0, n_channels, i;
|
||||
|
@ -3507,8 +3503,8 @@ static int nl80211_start_sched_scan(struct sk_buff *skb,
|
|||
return -EINVAL;
|
||||
|
||||
request = kzalloc(sizeof(*request)
|
||||
+ sizeof(*ssid) * n_ssids
|
||||
+ sizeof(channel) * n_channels
|
||||
+ sizeof(*request->ssids) * n_ssids
|
||||
+ sizeof(*request->channels) * n_channels
|
||||
+ ie_len, GFP_KERNEL);
|
||||
if (!request)
|
||||
return -ENOMEM;
|
||||
|
|
Loading…
Reference in a new issue