summaryrefslogtreecommitdiff
path: root/usr/src/lib/libdladm/common/libdlwlan.c
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2019-01-22 13:15:18 +0200
committerToomas Soome <tsoome@me.com>2019-06-25 08:26:54 +0300
commitc0e21d6af8bfe88f1c49c7c12d4537b663fe9db9 (patch)
tree5d936f9b2f7ca82041fedd243d5c08d0f436b246 /usr/src/lib/libdladm/common/libdlwlan.c
parentc8a3ee0e3658c32402e6bd505596d4fa45bfe17c (diff)
downloadillumos-gate-c0e21d6af8bfe88f1c49c7c12d4537b663fe9db9.tar.gz
11150 libdladm: NULL pointer errors
Reviewed by: Ryan Zezeski <rpz@joyent.com> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib/libdladm/common/libdlwlan.c')
-rw-r--r--usr/src/lib/libdladm/common/libdlwlan.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/usr/src/lib/libdladm/common/libdlwlan.c b/usr/src/lib/libdladm/common/libdlwlan.c
index 0593ae3cfc..59e1261dd2 100644
--- a/usr/src/lib/libdladm/common/libdlwlan.c
+++ b/usr/src/lib/libdladm/common/libdlwlan.c
@@ -47,23 +47,23 @@ static dladm_status_t wpa_instance_create(dladm_handle_t, datalink_id_t,
void *);
static dladm_status_t wpa_instance_delete(dladm_handle_t, datalink_id_t);
-static dladm_status_t do_get_bsstype(dladm_handle_t, datalink_id_t, void *,
+static dladm_status_t do_get_bsstype(dladm_handle_t, datalink_id_t, void *,
int);
-static dladm_status_t do_get_essid(dladm_handle_t, datalink_id_t, void *,
+static dladm_status_t do_get_essid(dladm_handle_t, datalink_id_t, void *,
int);
-static dladm_status_t do_get_bssid(dladm_handle_t, datalink_id_t, void *,
+static dladm_status_t do_get_bssid(dladm_handle_t, datalink_id_t, void *,
int);
-static dladm_status_t do_get_signal(dladm_handle_t, datalink_id_t, void *,
+static dladm_status_t do_get_signal(dladm_handle_t, datalink_id_t, void *,
int);
-static dladm_status_t do_get_encryption(dladm_handle_t, datalink_id_t, void *,
+static dladm_status_t do_get_encryption(dladm_handle_t, datalink_id_t, void *,
int);
-static dladm_status_t do_get_authmode(dladm_handle_t, datalink_id_t, void *,
+static dladm_status_t do_get_authmode(dladm_handle_t, datalink_id_t, void *,
int);
-static dladm_status_t do_get_linkstatus(dladm_handle_t, datalink_id_t, void *,
+static dladm_status_t do_get_linkstatus(dladm_handle_t, datalink_id_t, void *,
int);
static dladm_status_t do_get_esslist(dladm_handle_t, datalink_id_t, void *,
int);
-static dladm_status_t do_get_rate(dladm_handle_t, datalink_id_t, void *, int);
+static dladm_status_t do_get_rate(dladm_handle_t, datalink_id_t, void *, int);
static dladm_status_t do_get_mode(dladm_handle_t, datalink_id_t, void *, int);
static dladm_status_t do_get_capability(dladm_handle_t, datalink_id_t, void *,
int);
@@ -104,13 +104,13 @@ static val_desc_t linkstatus_vals[] = {
{ "connected", DLADM_WLAN_LINK_CONNECTED }
};
-static val_desc_t secmode_vals[] = {
+static val_desc_t secmode_vals[] = {
{ "none", DLADM_WLAN_SECMODE_NONE },
{ "wep", DLADM_WLAN_SECMODE_WEP },
{ "wpa", DLADM_WLAN_SECMODE_WPA }
};
-static val_desc_t strength_vals[] = {
+static val_desc_t strength_vals[] = {
{ "very weak", DLADM_WLAN_STRENGTH_VERY_WEAK },
{ "weak", DLADM_WLAN_STRENGTH_WEAK },
{ "good", DLADM_WLAN_STRENGTH_GOOD },
@@ -263,7 +263,7 @@ dladm_wlan_scan(dladm_handle_t handle, datalink_id_t linkid, void *arg,
uint32_t count;
wl_ess_conf_t *wlp;
wl_ess_list_t *wls = NULL;
- char buf[WLDP_BUFSIZE];
+ char buf[WLDP_BUFSIZE];
wl_linkstatus_t wl_status;
dladm_wlan_attr_t wlattr;
dladm_status_t status;
@@ -558,8 +558,8 @@ dladm_wlan_connect(dladm_handle_t handle, datalink_id_t linkid,
uint_t flags)
{
int i;
- char buf[WLDP_BUFSIZE];
- connect_state_t state = {0, NULL, NULL};
+ char buf[WLDP_BUFSIZE];
+ connect_state_t state = {0, 0, NULL};
attr_node_t *nodep = NULL;
boolean_t create_ibss, set_authmode;
dladm_wlan_attr_t **wl_list = NULL;