From: Jouni Malinen <j@w1.fi>
Date: Sat, 4 May 2013 16:06:08 +0000 (+0300)
Subject: Revert "nl80211: Add nla_put_u32() wrapper for Android"
X-Git-Tag: aosp-kk-from-upstream~308
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=048edb10707f810b2cc86af4b4b51a75326b8277;p=thirdparty%2Fhostap.git

Revert "nl80211: Add nla_put_u32() wrapper for Android"

This reverts commit df2f9ec6b2578def21fc26c88e661b5d28f0fbbf.

The current AOSP snapshot for JB includes nla_put_u32(), so this is not
needed anymore and is also causing linking issues due to duplicated
definition.

Signed-hostap: Jouni Malinen <j@w1.fi>
---

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 0433ca64b..654438cec 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -60,12 +60,6 @@
 
 #ifdef ANDROID
 #include "android_drv.h"
-
-/* system/core/libnl_2 in AOSP does not include nla_put_u32() */
-int nla_put_u32(struct nl_msg *msg, int attrtype, uint32_t value)
-{
-	return nla_put(msg, attrtype, sizeof(uint32_t), &value);
-}
 #endif /* ANDROID */
 #ifdef CONFIG_LIBNL20
 /* libnl 2.0 compatibility code */