diff options
| author | Jouni Malinen <j@w1.fi> | 2012-08-09 15:29:25 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2012-08-09 15:30:10 -0700 |
| commit | 80da0428ce21beb670d31bd06d025d8609d658b4 (patch) | |
| tree | 15e9075644523e0c8f80e4a587918a92a3c601bd /src | |
| parent | b5e8f06e18446918f6d801566e5709a8c87f1780 (diff) | |
| download | external_wpa_supplicant_8-80da0428ce21beb670d31bd06d025d8609d658b4.zip external_wpa_supplicant_8-80da0428ce21beb670d31bd06d025d8609d658b4.tar.gz external_wpa_supplicant_8-80da0428ce21beb670d31bd06d025d8609d658b4.tar.bz2 | |
Minor cleaning to be closer to mainstream
Change-Id: I4aed30c59c549c2ce7488f12df4e68c6154f0ffe
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/driver_nl80211.c | 7 | ||||
| -rw-r--r-- | src/drivers/driver_wext.c | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index cfcfd6b..ae1ddef 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -306,9 +306,6 @@ static int android_pno_start(struct i802_bss *bss, static int android_pno_stop(struct i802_bss *bss); #endif /* ANDROID */ #ifdef ANDROID_P2P -static void mlme_event_deauth_disassoc(struct wpa_driver_nl80211_data *drv, - enum wpa_event_type type, - const u8 *frame, size_t len); int wpa_driver_set_p2p_noa(void *priv, u8 count, int start, int duration); int wpa_driver_get_p2p_noa(void *priv, u8 *buf, size_t len); int wpa_driver_set_p2p_ps(void *priv, int legacy_ps, int opp_ps, int ctwindow); @@ -458,6 +455,9 @@ static int send_and_recv_msgs_global(struct nl80211_global *global, } +#ifndef ANDROID +static +#endif int send_and_recv_msgs(struct wpa_driver_nl80211_data *drv, struct nl_msg *msg, int (*valid_handler)(struct nl_msg *, void *), @@ -8382,7 +8382,6 @@ static int nl80211_disable_11b_rates(struct wpa_driver_nl80211_data *drv, wpa_printf(MSG_DEBUG, "nl80211: Set TX rates failed: ret=%d " "(%s)", ret, strerror(-ret)); } - return ret; nla_put_failure: diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c index fd90438..068e416 100644 --- a/src/drivers/driver_wext.c +++ b/src/drivers/driver_wext.c @@ -41,11 +41,8 @@ static int wpa_driver_wext_finish_drv_init(struct wpa_driver_wext_data *drv); static void wpa_driver_wext_disconnect(struct wpa_driver_wext_data *drv); static int wpa_driver_wext_set_auth_alg(void *priv, int auth_alg); #ifdef ANDROID -extern int wpa_driver_wext_driver_cmd(void *priv, char *cmd, char *buf, - size_t buf_len); extern int wpa_driver_wext_combo_scan(void *priv, struct wpa_driver_scan_params *params); -extern int wpa_driver_signal_poll(void *priv, struct wpa_signal_info *si); #endif int wpa_driver_wext_set_auth_param(struct wpa_driver_wext_data *drv, |