nl80211: Remove android_genl_ctrl_resolve()

Android libnl_2 implementation added support for "nl80211" name in
commit 'libnl_2: Extend genl_ctrl_resolve() to support "nl80211" name'
in July 2012 which got included in Android 4.2. It is fine to drop this
old Android ICS workaround from wpa_supplicant now.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 02aa6d3..5e046ba 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -87,7 +87,6 @@ static void nl80211_handle_destroy(struct nl_handle *handle)
 #undef nl_socket_set_nonblocking
 #define nl_socket_set_nonblocking(h) android_nl_socket_set_nonblocking(h)
 
-#define genl_ctrl_resolve android_genl_ctrl_resolve
 #endif /* ANDROID */
 
 

diff --git a/src/drivers/driver_nl80211.h b/src/drivers/driver_nl80211.h
index b5071b4..acfe959 100644 (file)
--- a/src/drivers/driver_nl80211.h
+++ b/src/drivers/driver_nl80211.h
@@ -232,7 +232,6 @@ int process_bss_event(struct nl_msg *msg, void *arg);
 
 #ifdef ANDROID
 int android_nl_socket_set_nonblocking(struct nl_handle *handle);
-int android_genl_ctrl_resolve(struct nl_handle *handle, const char *name);
 int android_pno_start(struct i802_bss *bss,
                      struct wpa_driver_scan_params *params);
 int android_pno_stop(struct i802_bss *bss);

diff --git a/src/drivers/driver_nl80211_android.c b/src/drivers/driver_nl80211_android.c
index 3cc9a65..f3a39f6 100644 (file)
--- a/src/drivers/driver_nl80211_android.c
+++ b/src/drivers/driver_nl80211_android.c
@@ -188,33 +188,3 @@ int android_nl_socket_set_nonblocking(struct nl_handle *handle)
 }
 
 
-int android_genl_ctrl_resolve(struct nl_handle *handle, const char *name)
-{
-       /*
-        * Android ICS has very minimal genl_ctrl_resolve() implementation, so
-        * need to work around that.
-        */
-       struct nl_cache *cache = NULL;
-       struct genl_family *nl80211 = NULL;
-       int id = -1;
-
-       if (genl_ctrl_alloc_cache(handle, &cache) < 0) {
-               wpa_printf(MSG_ERROR, "nl80211: Failed to allocate generic "
-                          "netlink cache");
-               goto fail;
-       }
-
-       nl80211 = genl_ctrl_search_by_name(cache, name);
-       if (nl80211 == NULL)
-               goto fail;
-
-       id = genl_family_get_id(nl80211);
-
-fail:
-       if (nl80211)
-               genl_family_put(nl80211);
-       if (cache)
-               nl_cache_free(cache);
-
-       return id;
-}