ti-compat-wireless-wl12xx: modifiy for using r5.sp4.01 release
PATCH 1/4 ti-compat-wireless-wl12xx: modifiy for using r5.sp4.01 release
From: Eyal Reizer <[email protected]>
* Modify the recipe to fetch a new wlan driver version (ol_R5.SP4.01)
* as described in "http://wireless.kernel.org/en/users/Download/hacking" we are extracting a compat package so it can be compiled with different kernels.
In our case the same compat-wireless package compiles with the am335,am37,am18 which use different Linux versions.
Until now this process was done manually and the resulted zip (compat-wireless.zip) was placed in a temporary location in g-forge and fetched by the recipe.
WLAN r&d are already using the approach of generating the compat-wireless package during build for building for example with android and we are adapting the same method."
* Change the recipe to generate the compat-wireless package directly from the ti-opnenlink gits instead of fetching a pre packaged zip from g-forge.
* Remove patches that are no longer needed as they were pulled into the compat-wireless git
--- .../0001-compat-wireless-exclude-BT-building.patch | 29 ------------ .../0002-compat-wireless-enable-test-mode.patch | 29 ------------ ...ompat-wireless-enable-uapsd-configuration.patch | 27 ----------- .../ti-compat-wireless-wl12xx_r5.bb | 47 +++++++++++++------- 4 files changed, 31 insertions(+), 101 deletions(-) delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0001-compat-wireless-exclude-BT-building.patch delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0002-compat-wireless-enable-test-mode.patch delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0002-ti-compat-wireless-enable-uapsd-configuration.patch
meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0001-compat-wireless-exclude-BT-building.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From 491bf7e73abf395f2af4a914d972dc7b73af2533 Mon Sep 17 00:00:00 2001 -From: Moosa <[email protected]> -Date: Thu, 24 May 2012 11:53:07 +0300 -Subject: [PATCH 1/2] compat-wireless: exclude BT building - -* Exclude Bluetooth components building from compat-wireless - -Upstream-Status: Pending - -Signed-off-by: Moosa Baransi <[email protected]> ---- - Makefile | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index a020661..ac75fb0 100644 ---- a/Makefile -+++ b/Makefile -@@ -37,8 +37,6 @@ endif - - endif - --obj-$(CONFIG_COMPAT_BLUETOOTH) += net/bluetooth/ --obj-$(CONFIG_COMPAT_BLUETOOTH_MODULES) += drivers/bluetooth/ - - else - --- -1.7.1
meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0002-compat-wireless-enable-test-mode.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From ca17ce77efde9a69ea4d82b86d4d51463d3e2b4a Mon Sep 17 00:00:00 2001 -From: Moosa <[email protected]> -Date: Thu, 24 May 2012 11:54:06 +0300 -Subject: [PATCH 2/2] compat-wireless: enable test mode - -* Enable test mode switch. Needed for the calibration process - -Upstream-Status: Pending - -Signed-off-by: Moosa Baransi <[email protected]> ---- - config.mk | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/config.mk b/config.mk -index f09d16d..65b485e 100644 ---- a/config.mk -+++ b/config.mk -@@ -198,7 +198,7 @@ CONFIG_MAC80211_MESH=y - CONFIG_CFG80211=m - CONFIG_CFG80211_DEFAULT_PS=y - # CONFIG_CFG80211_DEBUGFS=y --# CONFIG_NL80211_TESTMODE=y -+CONFIG_NL80211_TESTMODE=y - # CONFIG_CFG80211_DEVELOPER_WARNINGS=y - # CONFIG_CFG80211_REG_DEBUG=y - # CONFIG_CFG80211_INTERNAL_REGDB=y --- -1.7.1
meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0002-ti-compat-wireless-enable-uapsd-configuration.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From 74d34f0573183f3d4971fcae46ed9dadbf514626 Mon Sep 17 00:00:00 2001 -From: Eyal Reizer <[email protected]> -Date: Sun, 12 Jun 2011 17:33:09 +0300 -Subject: [PATCH] ti-compat-wireless:enable uapsd configuration - -this switch activates the wlan uapsd_queues settings - -Signed-off-by: Eyal Reizer <[email protected]> ---- - config.mk | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/config.mk b/config.mk -index f4cf832..a464b99 100644 ---- a/config.mk -+++ b/config.mk -@@ -110,7 +110,7 @@ endif #CONFIG_COMPAT_KERNEL_33 - # Wireless subsystem stuff - CONFIG_MAC80211=m - --# CONFIG_MAC80211_DEBUGFS=y -+CONFIG_MAC80211_DEBUGFS=y - # CONFIG_MAC80211_NOINLINE=y - # CONFIG_MAC80211_VERBOSE_DEBUG=y - # CONFIG_MAC80211_HT_DEBUG=y --- -1.7.0.4
meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx_r5.bb +31 -16
69 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 2/4 wl12xx-firmware: update for fetching r5.sp4.01 firmware
From: Eyal Reizer <[email protected]>
update the recipe for fetching the r5.sp4.01 wlan firmware
--- .../wl12xx-firmware/wl12xx-firmware_git.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta-arago-extras/recipes-bsp/wl12xx-firmware/wl12xx-firmware_git.bb +2 -2
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=ba590e1d103f891d0151609046aef9e8" PACKAGE_ARCH = "all" -PR = "r1+gitr${SRCREV}" +PR = "r2+gitr${SRCREV}" # This recipe provides the latest firmware files for wl12xx. # Therefore, use the contents of this recipe instead of the contents
@@ -12,7 +12,7 @@ PR = "r1+gitr${SRCREV}" RCONFLICTS_${PN} = "linux-firmware-wl12xx" RPROVIDES_${PN} = "linux-firmware-wl12xx" -SRCREV = "ol_R5.SP3.05" +SRCREV = "ol_R5.SP4.01" SRC_URI = "git://github.com/TI-OpenLink/ti-utils.git;protocol=git \ file://Makefile \ "
Signature · 1 line
1.7.0.4
PATCH 3/4 hostap-daemon: update for version r5.sp4.01
In reply to [email protected]From: Eyal Reizer <[email protected]>
update the recipe for using the version from r5.sp.01 wlan release
--- ...d-change-conf-file-for-better-oob-startup.patch | 16 ++++++++-------- .../hostap/hostap-daemon_git.bb | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-)
meta-arago-extras/recipes-connectivity/hostap/hostap-daemon/0001-hostapd-change-conf-file-for-better-oob-startup.patch +8 -8
@@ -1,6 +1,6 @@ -From 685a744a1dc46853185191eb46a7cae4d49f30d1 Mon Sep 17 00:00:00 2001 +From 66b55f187843bca53cb3b7ef9c8fcd434a72f768 Mon Sep 17 00:00:00 2001 From: Eyal Reizer <[email protected]> -Date: Mon, 19 Nov 2012 09:47:39 +0200 +Date: Thu, 21 Feb 2013 03:55:22 -0800 Subject: [PATCH] hostapd: change conf file for better sdk out of box startup Change the default channel to 6 and change the ssid to a more
@@ -14,7 +14,7 @@ Signed-off-by: Eyal Reizer <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf -index 494f7ca..9310ef4 100644 +index f71a881..00843aa 100644 --- a/hostapd/hostapd.conf +++ b/hostapd/hostapd.conf @@ -83,7 +83,7 @@ ctrl_interface_group=0
@@ -26,15 +26,15 @@ index 494f7ca..9310ef4 100644 # Country code (ISO/IEC 3166-1). Used to set regulatory domain. # Set as needed to indicate country in which device is operating. -@@ -105,7 +105,7 @@ hw_mode=g - # (default: 0, i.e., not set) - # Please note that some drivers do not use this value from hostapd and the +@@ -107,7 +107,7 @@ hw_mode=g # channel will need to be configured separately with iwconfig. + # When set to 0, automatic channel selection will be engaged. A channel + # will be selected from the desired hw_mode. -channel=1 +channel=6 - # Beacon interval in kus (1.024 ms) (default: 100; range 15..65535) - beacon_int=100 + # Automatic channel selection (ACS) whitelist + # (default: not set) -- 1.7.9.5
meta-arago-extras/recipes-connectivity/hostap/hostap-daemon_git.bb +2 -2
@@ -22,9 +22,9 @@ CONFFILES_${PN} += "${sysconfdir}/hostapd.conf" # of hostap PV = "2.0-devel-ti" -PR = "r1+gitr${SRCPV}" +PR = "r2+gitr${SRCPV}" -SRCREV = "ol_R5.SP3.05" +SRCREV = "ol_R5.SP4.01" SRC_URI = "git://github.com/TI-OpenLink/hostap.git;protocol=git \ file://0001-hostapd-change-conf-file-for-better-oob-startup.patch;patchdir=.. \
Signature · 1 line
1.7.0.4
PATCH 4/4 wpa-supplicant: update for r5.sp4.01 version
In reply to [email protected]From: Eyal Reizer <[email protected]>
update for using the wpa-supplicant version from r5.sp4.01 release
--- ...ken-rx-action-frame-handling-INTERNAL-SQU.patch | 86 -------------------- .../wpa-supplicant/wpa-supplicant_git.bb | 5 +- 2 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-P2P-Fix-broken-rx-action-frame-handling-INTERNAL-SQU.patch
meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-P2P-Fix-broken-rx-action-frame-handling-INTERNAL-SQU.patch deleted +0 -86
@@ -1,86 +0,0 @@ -From 4e1835b2ccb4698e8e7022522928317d219bca32 Mon Sep 17 00:00:00 2001 -From: Eyal Shapira <[email protected]> -Date: Tue, 13 Nov 2012 03:00:21 +0200 -Subject: [PATCH] P2P: Fix broken rx action frame handling (INTERNAL-SQUASH) - -Commit "P2P: Fix duplicate handling of rx action frames" -went too far and dropped any rx action frames arriving on the GO -interface. It assumed that any action frames were duplicated -and received on both GO interface and P2P device interface. -This is wrong as some actions frames like P2P presence request -are sent to the GO interface address and won't be duplicated. - -The root cause of the duplication lies within the Rx path in mac80211 -in Johannes` patch "mac80211: accept public action frames with mismatched BSSID". -When wpa_s works with a separate group interface this creates a duplicated Rx -on both the P2P dev interface and the GO interface. - -Fix the issue by canceling the duplication in wpa_s and discarding -public action frames with unmatching bssid arriving on a dedicated GO interface - -(This should be squashed with -"P2P: Fix duplicate handling of rx action frames") - -Signed-off-by: Eyal Shapira <[email protected]> ---- - src/p2p/p2p.h | 5 +++++ - src/p2p/p2p_i.h | 1 - - wpa_supplicant/p2p_supplicant.c | 16 +++++++++++++--- - 3 files changed, 18 insertions(+), 4 deletions(-) - -diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h -index 3c439f3..a60974f 100644 ---- a/src/p2p/p2p.h -+++ b/src/p2p/p2p.h -@@ -1726,4 +1726,9 @@ int p2p_prepare_channel(struct p2p_data *p2p, unsigned int force_freq); - void p2p_set_config_timeout(struct p2p_data *p2p, u8 go_timeout, - u8 client_timeout); - -+/** -+ * p2p_group_get_interface_addr - Get the interface address of a P2P group -+ * @group: P2P group context from p2p_group_init() -+ */ -+const u8 *p2p_group_get_interface_addr(struct p2p_group *group); - #endif /* P2P_H */ -diff --git a/src/p2p/p2p_i.h b/src/p2p/p2p_i.h -index d254818..9e3fd6f 100644 ---- a/src/p2p/p2p_i.h -+++ b/src/p2p/p2p_i.h -@@ -557,7 +557,6 @@ struct p2p_noa_desc { - }; - - /* p2p_group.c */ --const u8 * p2p_group_get_interface_addr(struct p2p_group *group); - u8 p2p_group_presence_req(struct p2p_group *group, - const u8 *client_interface_addr, - const u8 *noa, size_t noa_len); -diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c -index d8d72da..42c062f 100644 ---- a/wpa_supplicant/p2p_supplicant.c -+++ b/wpa_supplicant/p2p_supplicant.c -@@ -4137,9 +4137,19 @@ void wpas_p2p_rx_action(struct wpa_supplicant *wpa_s, const u8 *da, - if (wpa_s->global->p2p == NULL) - return; - -- if (wpa_s->p2p_group_interface != NOT_P2P_GROUP_INTERFACE) { -- wpa_printf(MSG_DEBUG, "Discard RX action event on P2P " -- "GO/CLI iface. P2P Device interface will handle it"); -+ /* -+ * Discard an Rx duplication created by mac80211 rx path -+ * when receiving public action frames with mismatched BSSID -+ * In case of separate GO interface such public action frames (prov disc -+ * dev disc, invites) these should be handled by the P2P dev interface -+ */ -+ if (wpa_s->p2p_group_interface == P2P_GROUP_INTERFACE_GO && -+ category == WLAN_ACTION_PUBLIC && -+ wpa_s->p2p_group && -+ os_memcmp(bssid, p2p_group_get_interface_addr(wpa_s->p2p_group), -+ ETH_ALEN)) { -+ wpa_printf(MSG_DEBUG, "Discard duplicate RX action event on" -+ " P2P GO interface"); - return; - } - --- -1.7.9.5 -
meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant_git.bb +2 -3
@@ -16,8 +16,8 @@ RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" # wpa-supplicant the DEFAULT_PREFERENCE will be set to -1. DEFAULT_PREFERENCE = "-1" -SRCREV = "ol_R5.SP3.05" -PR = "r2+gitr${SRCPV}" +SRCREV = "ol_R5.SP4.01" +PR = "r3+gitr${SRCPV}" # Add ti to the PV to indicate that this is a TI modify version of wpa-supplicant. PV = "2.0-devel-ti"
@@ -32,7 +32,6 @@ SRC_URI = "git://github.com/TI-OpenLink/hostap.git;protocol=git \ file://wpa_supplicant.conf \ file://fi.epitest.hostap.WPASupplicant.service \ file://fi.w1.wpa_supplicant1.service \ - file://0001-P2P-Fix-broken-rx-action-frame-handling-INTERNAL-SQU.patch;patchdir=.. \ " S = "${WORKDIR}/git/wpa_supplicant"
Signature · 1 line
1.7.0.4