From: Filipe Brandenburger <filbranden@google.com>
Date: Thu, 30 Jul 2015 21:35:15 +0000 (-0700)
Subject: iw: remove android-nl.c with unneeded workaround
X-Git-Tag: v4.3~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63e11c41cff4ced4d165f3d1c80802392f92f8fb;p=thirdparty%2Fiw.git

iw: remove android-nl.c with unneeded workaround

The workaround might have been necessary in the past, however now it
produces the following error:

  .../libnl.a(attr.o): multiple definition of 'nla_put_flag'
  .../android-nl.o: previous definition here
  collect2: error: ld returned 1 exit status

TEST=Built AOSP tree with this patchset, tested the generated iw binary.

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/Android.mk b/Android.mk
index 03bcc3e..4a50f89 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,7 +7,7 @@ IW_ANDROID_BUILD=y
 NO_PKG_CONFIG=y
 include $(LOCAL_PATH)/Makefile
 
-LOCAL_SRC_FILES := $(patsubst %.o,%.c,$(OBJS)) android-nl.c
+LOCAL_SRC_FILES := $(patsubst %.o,%.c,$(OBJS))
 
 LOCAL_CFLAGS += -DCONFIG_LIBNL20
 LOCAL_LDFLAGS := -Wl,--no-gc-sections
diff --git a/android-nl.c b/android-nl.c
deleted file mode 100644
index d216f5f..0000000
--- a/android-nl.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <netlink/attr.h>
-
-int nla_put_flag(struct nl_msg *msg, int flag)
-{
-	return nla_put(msg, flag, 0, NULL);
-}