Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-26 18:59:22 +01:00
Code Releases Activity

wiphy: Remove unneeded variable

Browse Source 
Instead of always mallocing space for the ssid array, and then freeing
it in most circumstances, do the opposite.  Only allocate the array once
it is actually needed.  This has the side effect of removing an unneeded
variable and making the code simpler.
This commit is contained in:
Denis Kenzior 2015-01-28 15:31:52 -06:00
parent 9f042ff1b8
commit 0303a095aa
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/wiphy.c
View File

@ -610,7 +610,7 @@ static void mlme_associate(struct netdev *netdev, struct network *network)
l_genl_msg_unref(msg); l_genl_msg_unref(msg);
} }
static bool parse_ie(struct bss *bss, uint8_t **ssid, int *ssid_len, static bool parse_ie(struct bss *bss, const uint8_t **ssid, int *ssid_len,
struct ie_rsn_info *rsne, struct ie_rsn_info *rsne,
const void *data, uint16_t len) const void *data, uint16_t len)
{ {
@ -630,7 +630,7 @@ static bool parse_ie(struct bss *bss, uint8_t **ssid, int *ssid_len,
} }
*ssid_len = iter.len; *ssid_len = iter.len;
*ssid = l_memdup(iter.data, iter.len); *ssid = iter.data;
break; break;
case IE_TYPE_RSN: case IE_TYPE_RSN:
ret = ie_parse_rsne_from_data(iter.data - 2, ret = ie_parse_rsne_from_data(iter.data - 2,
@ -664,7 +664,7 @@ static void parse_bss(struct netdev *netdev, struct l_genl_attr *attr)
uint16_t type, len; uint16_t type, len;
const void *data; const void *data;
struct bss *bss; struct bss *bss;
uint8_t *ssid = NULL; const uint8_t *ssid = NULL;
int ssid_len; int ssid_len;
struct network *network = NULL; struct network *network = NULL;
struct ie_rsn_info rsne = { 0 }; struct ie_rsn_info rsne = { 0 };
@ -721,7 +721,6 @@ static void parse_bss(struct netdev *netdev, struct l_genl_attr *attr)
l_warn("Received BSS but SSID IE returned NULL -- ignoring"); l_warn("Received BSS but SSID IE returned NULL -- ignoring");
goto fail; goto fail;
} else { } else {
bool network_found = false;
const char *id; const char *id;
ssid_security = scan_get_ssid_security(bss->capability, &rsne); ssid_security = scan_get_ssid_security(bss->capability, &rsne);
@ -736,13 +735,11 @@ static void parse_bss(struct netdev *netdev, struct l_genl_attr *attr)
network = l_new(struct network, 1); network = l_new(struct network, 1);
network->netdev = netdev; network->netdev = netdev;
network->ssid = ssid; network->ssid = l_memdup(ssid, ssid_len);
network->ssid_len = ssid_len; network->ssid_len = ssid_len;
network->ssid_security = ssid_security; network->ssid_security = ssid_security;
network->bss_list = l_queue_new(); network->bss_list = l_queue_new();
network_found = true;
l_hashmap_insert(netdev->networks, id, network); l_hashmap_insert(netdev->networks, id, network);
if (!l_dbus_register_interface(dbus_get_bus(), if (!l_dbus_register_interface(dbus_get_bus(),
@ -774,16 +771,12 @@ static void parse_bss(struct netdev *netdev, struct l_genl_attr *attr)
l_debug("Found existing BSS '%s'", l_debug("Found existing BSS '%s'",
bss_address_to_string(bss)); bss_address_to_string(bss));
} }
if (!network_found)
l_free(ssid);
} }
l_queue_push_head(netdev->bss_list, bss); l_queue_push_head(netdev->bss_list, bss);
return; return;
fail: fail:
l_free(ssid);
bss_free(bss); bss_free(bss);
} }