iw.patch

diff --git a/Android.mk b/Android.mk
index ffdc01a..3bff8fe 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,19 +32,20 @@ LOCAL_SRC_FILES := \
 
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH) \
-	external/libnl/include
+	external/libnl-headers
 
 
 LOCAL_NO_DEFAULT_COMPILER_FLAGS := true
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libnl/include \
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libnl-headers \
 	$(TARGET_PROJECT_INCLUDES) $(TARGET_C_INCLUDES)
 LOCAL_CFLAGS := $(TARGET_GLOBAL_CFLAGS) $(PRIVATE_ARM_CFLAGS)
 
-LOCAL_SHARED_LIBRARIES += libnl
+LOCAL_CFLAGS += -DCONFIG_LIBNL20=y
+
 LOCAL_MODULE := iw
 LOCAL_LDFLAGS := -Wl,--no-gc-sections
-LOCAL_MODULE_TAGS := eng
-LOCAL_SHARED_LIBRARIES := libnl
+LOCAL_MODULE_TAGS := debug
+LOCAL_STATIC_LIBRARIES := libnl_2
 LOCAL_MODULE := iw
 
 include $(BUILD_EXECUTABLE)
diff --git a/iw.c b/iw.c
index 895c51a..09d47fe 100644
--- a/iw.c
+++ b/iw.c
@@ -405,8 +405,6 @@ static int __handle_cmd(struct nl80211_state *state, enum id_input idby,
 	if (err)
 		goto out;
 
-	nl_socket_set_cb(state->nl_sock, s_cb);
-
 	err = nl_send_auto_complete(state->nl_sock, msg);
 	if (err < 0)
 		goto out;