From 2aafdedecc205a9addcfd982e645cdcfc0bcf56e Mon Sep 17 00:00:00 2001 From: Roman Yeryomin Date: Tue, 27 Aug 2013 12:36:21 +0300 Subject: Merge realtek wifi driver patches into one Signed-off-by: Roman Yeryomin --- .../patches-2.6.30/004-rtl8192cd-fixes.diff | 33 +++++++++++++++++ .../patches-2.6.30/009-hostapd-support.patch | 43 ---------------------- 2 files changed, 33 insertions(+), 43 deletions(-) delete mode 100644 target/linux/realtek/patches-2.6.30/009-hostapd-support.patch diff --git a/target/linux/realtek/patches-2.6.30/004-rtl8192cd-fixes.diff b/target/linux/realtek/patches-2.6.30/004-rtl8192cd-fixes.diff index 0f5209d49..262b64319 100644 --- a/target/linux/realtek/patches-2.6.30/004-rtl8192cd-fixes.diff +++ b/target/linux/realtek/patches-2.6.30/004-rtl8192cd-fixes.diff @@ -35,3 +35,36 @@ /*----------------------------------------------------------------------------- 8192cd_net80211.c +--- a/drivers/net/wireless/rtl8192cd/8192cd_cfg.h ++++ b/drivers/net/wireless/rtl8192cd/8192cd_cfg.h +@@ -357,7 +357,7 @@ + //------------------------------------------------------------- + // WPA Supplicant + //------------------------------------------------------------- +-//#define WIFI_WPAS ++#define WIFI_WPAS + + #ifdef WIFI_WPAS + #ifndef WIFI_HAPD +@@ -525,9 +525,10 @@ + //------------------------------------------------------------- + // Hostapd + //------------------------------------------------------------- +-//#ifdef CONFIG_RTL_HOSTAPD_SUPPORT +-//#define WIFI_HAPD +-//#endif ++#ifdef CONFIG_RTL_HOSTAPD_SUPPORT ++#define WIFI_HAPD ++#endif ++ + #ifdef CONFIG_RTL_P2P_SUPPORT + #define P2P_SUPPORT // support for WIFI_Direct + //#define P2P_DEBUGMSG +@@ -1836,3 +1837,7 @@ + + #endif // _8192CD_CFG_H_ + ++#ifndef WIFI_HAPD ++#error hapd not-set ++#endif ++ diff --git a/target/linux/realtek/patches-2.6.30/009-hostapd-support.patch b/target/linux/realtek/patches-2.6.30/009-hostapd-support.patch deleted file mode 100644 index 81689bb03..000000000 --- a/target/linux/realtek/patches-2.6.30/009-hostapd-support.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit a824c8afe0a79e248056e7160a3c590d8eaaae54 -Author: Roman Yeryomin -Date: Tue Feb 5 02:10:00 2013 +0200 - - adopt 009-hostapd-support.patch - - Signed-off-by: Roman Yeryomin - -diff --git a/drivers/net/wireless/rtl8192cd/8192cd_cfg.h b/drivers/net/wireless/rtl8192cd/8192cd_cfg.h -index ae02e5a..e2596f2 100644 ---- a/drivers/net/wireless/rtl8192cd/8192cd_cfg.h -+++ b/drivers/net/wireless/rtl8192cd/8192cd_cfg.h -@@ -357,7 +357,7 @@ - //------------------------------------------------------------- - // WPA Supplicant - //------------------------------------------------------------- --//#define WIFI_WPAS -+#define WIFI_WPAS - - #ifdef WIFI_WPAS - #ifndef WIFI_HAPD -@@ -525,9 +525,10 @@ - //------------------------------------------------------------- - // Hostapd - //------------------------------------------------------------- --//#ifdef CONFIG_RTL_HOSTAPD_SUPPORT --//#define WIFI_HAPD --//#endif -+#ifdef CONFIG_RTL_HOSTAPD_SUPPORT -+#define WIFI_HAPD -+#endif -+ - #ifdef CONFIG_RTL_P2P_SUPPORT - #define P2P_SUPPORT // support for WIFI_Direct - //#define P2P_DEBUGMSG -@@ -1836,3 +1837,7 @@ - - #endif // _8192CD_CFG_H_ - -+#ifndef WIFI_HAPD -+#error hapd not-set -+#endif -+ -- cgit v1.2.3