From: Andrew Zaborowski <balrogg@gmail.com>
To: iwd@lists.01.org
Subject: [PATCH 07/11] netdev: Drop unused netdev_connect_wsc
Date: Mon, 21 Oct 2019 15:55:06 +0200 [thread overview]
Message-ID: <20191021135510.12657-7-balrogg@gmail.com> (raw)
In-Reply-To: <20191021135510.12657-1-balrogg@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 3376 bytes --]
From: Andrew Zaborowski <andrew.zaborowski@intel.com>
---
src/netdev.c | 57 ----------------------------------------------------
src/netdev.h | 9 ---------
2 files changed, 66 deletions(-)
diff --git a/src/netdev.c b/src/netdev.c
index 93baa6ea..488370ab 100644
--- a/src/netdev.c
+++ b/src/netdev.c
@@ -52,7 +52,6 @@
#include "src/device.h"
#include "src/scan.h"
#include "src/netdev.h"
-#include "src/wscutil.h"
#include "src/ft.h"
#include "src/util.h"
#include "src/watchlist.h"
@@ -2509,62 +2508,6 @@ int netdev_connect(struct netdev *netdev, struct scan_bss *bss,
event_filter, cb, user_data);
}
-int netdev_connect_wsc(struct netdev *netdev, struct scan_bss *bss,
- struct handshake_state *hs,
- netdev_event_func_t event_filter,
- netdev_connect_cb_t cb,
- netdev_eapol_event_func_t eapol_cb,
- void *user_data)
-{
- struct l_genl_msg *cmd_connect;
- struct wsc_association_request request;
- uint8_t *pdu;
- size_t pdu_len;
- void *ie;
- size_t ie_len;
- struct eapol_sm *sm;
-
- if (netdev->type != NL80211_IFTYPE_STATION &&
- netdev->type != NL80211_IFTYPE_P2P_CLIENT)
- return -ENOTSUP;
-
- if (netdev->connected)
- return -EISCONN;
-
- cmd_connect = netdev_build_cmd_connect(netdev, bss, hs, NULL, NULL, 0);
- if (!cmd_connect)
- return -EINVAL;
-
- request.version2 = true;
- request.request_type = WSC_REQUEST_TYPE_ENROLLEE_OPEN_8021X;
-
- pdu = wsc_build_association_request(&request, &pdu_len);
- if (!pdu)
- goto error;
-
- ie = ie_tlv_encapsulate_wsc_payload(pdu, pdu_len, &ie_len);
- l_free(pdu);
-
- if (!ie)
- goto error;
-
- l_genl_msg_append_attr(cmd_connect, NL80211_ATTR_IE, ie_len, ie);
- l_free(ie);
-
- handshake_state_set_eap_event_func(hs,
- (handshake_eap_event_func_t) eapol_cb,
- user_data);
-
- sm = eapol_sm_new(hs);
-
- return netdev_connect_common(netdev, cmd_connect, bss, hs, sm,
- event_filter, cb, user_data);
-
-error:
- l_genl_msg_unref(cmd_connect);
- return -ENOMEM;
-}
-
int netdev_disconnect(struct netdev *netdev,
netdev_disconnect_cb_t cb, void *user_data)
{
diff --git a/src/netdev.h b/src/netdev.h
index 77da52de..b4da4fc2 100644
--- a/src/netdev.h
+++ b/src/netdev.h
@@ -107,9 +107,6 @@ typedef void (*netdev_watch_func_t)(struct netdev *netdev,
enum netdev_watch_event event,
void *user_data);
typedef void (*netdev_destroy_func_t)(void *user_data);
-typedef void (*netdev_eapol_event_func_t)(unsigned int event,
- const void *event_data,
- void *user_data);
typedef void (*netdev_neighbor_report_cb_t)(struct netdev *netdev, int err,
const uint8_t *reports,
size_t reports_len, void *user_data);
@@ -150,12 +147,6 @@ int netdev_connect(struct netdev *netdev, struct scan_bss *bss,
size_t num_vendor_ies,
netdev_event_func_t event_filter,
netdev_connect_cb_t cb, void *user_data);
-int netdev_connect_wsc(struct netdev *netdev, struct scan_bss *bss,
- struct handshake_state *hs,
- netdev_event_func_t event_filter,
- netdev_connect_cb_t cb,
- netdev_eapol_event_func_t eapol_cb,
- void *user_data);
int netdev_disconnect(struct netdev *netdev,
netdev_disconnect_cb_t cb, void *user_data);
int netdev_reassociate(struct netdev *netdev, struct scan_bss *target_bss,
--
2.20.1
next prev parent reply other threads:[~2019-10-21 13:55 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-21 13:55 [PATCH 01/11] netdev: Add a wdev_id based frame watch API Andrew Zaborowski
2019-10-21 13:55 ` [PATCH 02/11] netdev: Report RSSI to frame watch callbacks Andrew Zaborowski
2019-10-22 3:34 ` Denis Kenzior
2019-10-22 13:46 ` Andrew Zaborowski
2019-10-21 13:55 ` [PATCH 03/11] netdev: Extend checks for P2P scenarios Andrew Zaborowski
2019-10-22 3:36 ` Denis Kenzior
2019-10-21 13:55 ` [PATCH 04/11] eapol: Move the EAP event handler to handshake state Andrew Zaborowski
2019-10-22 4:11 ` Denis Kenzior
2019-10-22 14:00 ` Andrew Zaborowski
2019-10-22 14:34 ` Denis Kenzior
2019-10-21 13:55 ` [PATCH 05/11] unit: Update test-wsc to use handshake_state_set_eap_event_func Andrew Zaborowski
2019-10-21 13:55 ` [PATCH 06/11] wsc: Replace netdev_connect_wsc with netdev_connect usage Andrew Zaborowski
2019-10-21 13:55 ` Andrew Zaborowski [this message]
2019-10-21 13:55 ` [PATCH 08/11] wsc: Add wsc_new_p2p_enrollee, refactor Andrew Zaborowski
2019-10-22 14:47 ` Denis Kenzior
2019-10-22 23:46 ` Andrew Zaborowski
2019-10-21 13:55 ` [PATCH 09/11] wsc: Accept extra IEs in wsc_new_p2p_enrollee Andrew Zaborowski
2019-10-21 13:55 ` [PATCH 10/11] wiphy: Add wiphy_get_max_roc_duration Andrew Zaborowski
2019-10-22 3:26 ` Denis Kenzior
2019-10-21 13:55 ` [PATCH 11/11] wiphy: Add wiphy_get_supported_rates Andrew Zaborowski
2019-10-22 14:53 ` [PATCH 01/11] netdev: Add a wdev_id based frame watch API Denis Kenzior
2019-10-22 23:56 ` Andrew Zaborowski
2019-10-23 0:23 ` Denis Kenzior
2019-10-23 1:04 ` Andrew Zaborowski
2019-10-23 1:32 ` Denis Kenzior
2019-10-24 0:59 ` Andrew Zaborowski
2019-10-24 2:53 ` Denis Kenzior
2019-10-24 3:22 ` Andrew Zaborowski
2019-10-24 15:29 ` Denis Kenzior
2019-10-24 21:47 ` Andrew Zaborowski
2019-10-24 22:16 ` Denis Kenzior
2019-10-24 22:45 ` Andrew Zaborowski
2019-10-25 1:27 ` Denis Kenzior
2019-10-25 2:59 ` Andrew Zaborowski
2019-10-25 3:56 ` Denis Kenzior
2019-10-25 4:42 ` Andrew Zaborowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191021135510.12657-7-balrogg@gmail.com \
--to=balrogg@gmail.com \
--cc=iwd@lists.01.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.