driver_nl80211: Return correct value

[libeap.git] / hostapd / driver_nl80211.c

diff --git a/hostapd/driver_nl80211.c b/hostapd/driver_nl80211.c
index 0af6967..cd2c66a 100644 (file)
--- a/hostapd/driver_nl80211.c
+++ b/hostapd/driver_nl80211.c
@@ -220,7 +220,7 @@ static int i802_set_encryption(const char *iface, void *priv, const char *alg,
        if (nl_send_auto_complete(drv->nl_handle, msg) < 0 ||
            (err = nl_wait_for_ack(drv->nl_handle)) < 0) {
                if (err != -ENOENT) {
-                       err = 0;
+                       ret = 0;
                        goto out;
                }
        }
@@ -249,7 +249,7 @@ static int i802_set_encryption(const char *iface, void *priv, const char *alg,
        if (nl_send_auto_complete(drv->nl_handle, msg) < 0 ||
            (err = nl_wait_for_ack(drv->nl_handle)) < 0) {
                if (err != -ENOENT) {
-                       err = 0;
+                       ret = 0;
                        goto out;
                }
        }
@@ -314,7 +314,7 @@ static int i802_get_seqnum(const char *iface, void *priv, const u8 *addr,
        NLA_PUT_U8(msg, NL80211_ATTR_KEY_IDX, idx);
        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(iface));
 
-       cb = nl_cb_alloc(NL_CB_CUSTOM);
+       cb = nl_cb_clone(drv->nl_cb);
        if (!cb)
                goto out;
 
@@ -661,7 +661,7 @@ static int i802_read_sta_data(void *priv, struct hostap_sta_driver_data *data,
        NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, addr);
        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(drv->iface));
 
-       cb = nl_cb_alloc(NL_CB_CUSTOM);
+       cb = nl_cb_clone(drv->nl_cb);
        if (!cb)
                goto out;
 
@@ -1416,7 +1416,7 @@ static struct hostapd_hw_modes *i802_get_hw_feature_data(void *priv,
        struct nl_msg *msg;
        int err = -1;
        struct nl_cb *cb = NULL;
-       int finished;
+       int finished = 0;
        struct phy_info_arg result = {
                .num_modes = num_modes,
                .modes = NULL,
@@ -1435,7 +1435,7 @@ static struct hostapd_hw_modes *i802_get_hw_feature_data(void *priv,
 
        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(drv->iface));
 
-       cb = nl_cb_alloc(NL_CB_CUSTOM);
+       cb = nl_cb_clone(drv->nl_cb);
        if (!cb)
                goto out;