From c6d933eb86be1d4dccabcf5f2722100bd46fd47e Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 1 Jan 2011 06:26:20 -0800 Subject: [PATCH] compat-wireless: rtl8187 and rtl8180 moved The rtl8187 and rtl8180 modules moved to an other subdirectory and the filenames were changed. The makefile includes some header, where the path has to be changed. Signed-off-by: Hauke Mehrtens --- patches/25-multicast-list_head.patch | 22 +++++++++---------- ...e.patch => 35-fix-makefile-includes.patch} | 20 +++++++++++++++++ scripts/admin-update.sh | 2 ++ 3 files changed, 33 insertions(+), 11 deletions(-) rename patches/{35-backport-brcm80211-Makefile.patch => 35-fix-makefile-includes.patch} (57%) diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index 8ad83912be0b..3d8632ee88e4 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -162,7 +162,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c -@@ -3131,20 +3131,42 @@ unlock: +@@ -3135,20 +3135,42 @@ unlock: } static u64 ath5k_prepare_multicast(struct ieee80211_hw *hw, @@ -205,7 +205,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val; pos &= 0x3f; mfilt[pos / 32] |= (1 << (pos % 32)); -@@ -3153,6 +3175,9 @@ static u64 ath5k_prepare_multicast(struc +@@ -3157,6 +3179,9 @@ static u64 ath5k_prepare_multicast(struc * neet to inform below to not reset the mcast */ /* ath5k_hw_set_mcast_filterindex(ah, * ha->addr[5]); */ @@ -445,7 +445,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 size_t fw_name_len, u32 *hw_ver); --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c -@@ -1609,7 +1609,11 @@ static void set_multicast_list(struct us +@@ -1629,7 +1629,11 @@ static void set_multicast_list(struct us netdev_for_each_mc_addr(ha, usbdev->net) memcpy(mc_addrs + i++ * ETH_ALEN, @@ -457,8 +457,8 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } netif_addr_unlock_bh(usbdev->net); ---- a/drivers/net/wireless/rtl818x/rtl8180_dev.c -+++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c +--- a/drivers/net/wireless/rtl818x/rtl8180/dev.c ++++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c @@ -815,10 +815,19 @@ static void rtl8180_bss_info_changed(str } } @@ -479,8 +479,8 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } static void rtl8180_configure_filter(struct ieee80211_hw *dev, ---- a/drivers/net/wireless/rtl818x/rtl8187_dev.c -+++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c +--- a/drivers/net/wireless/rtl818x/rtl8187/dev.c ++++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c @@ -1194,9 +1194,17 @@ static void rtl8187_bss_info_changed(str } @@ -677,7 +677,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -719,7 +719,12 @@ struct ieee80211_local { +@@ -734,7 +734,12 @@ struct ieee80211_local { struct work_struct recalc_smps; /* aggregated multicast list */ @@ -692,7 +692,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -433,8 +433,13 @@ static void ieee80211_do_stop(struct iee +@@ -435,8 +435,13 @@ static void ieee80211_do_stop(struct iee netif_addr_lock_bh(sdata->dev); spin_lock_bh(&local->filter_lock); @@ -706,7 +706,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 spin_unlock_bh(&local->filter_lock); netif_addr_unlock_bh(sdata->dev); -@@ -593,7 +598,12 @@ static void ieee80211_set_multicast_list +@@ -595,7 +600,12 @@ static void ieee80211_set_multicast_list sdata->flags ^= IEEE80211_SDATA_PROMISC; } spin_lock_bh(&local->filter_lock); @@ -733,7 +733,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 spin_unlock_bh(&local->filter_lock); /* be a bit nasty */ -@@ -555,9 +559,11 @@ struct ieee80211_hw *ieee80211_alloc_hw( +@@ -559,9 +563,11 @@ struct ieee80211_hw *ieee80211_alloc_hw( local->uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN; INIT_LIST_HEAD(&local->interfaces); diff --git a/patches/35-backport-brcm80211-Makefile.patch b/patches/35-fix-makefile-includes.patch similarity index 57% rename from patches/35-backport-brcm80211-Makefile.patch rename to patches/35-fix-makefile-includes.patch index bc57367f8369..c80e11fb66bc 100644 --- a/patches/35-backport-brcm80211-Makefile.patch +++ b/patches/35-fix-makefile-includes.patch @@ -1,3 +1,23 @@ +When some other headers are included in some makefile it must be +relative to the current object file processed. When giving the full +path the make process will search in the kernel tree for the headers. + +--- a/drivers/net/wireless/rtl818x/rtl8180/Makefile ++++ b/drivers/net/wireless/rtl818x/rtl8180/Makefile +@@ -2,4 +2,4 @@ rtl8180-objs := dev.o rtl8225.o sa2400. + + obj-$(CONFIG_RTL8180) += rtl8180.o + +-ccflags-y += -Idrivers/net/wireless/rtl818x ++ccflags-y += -I$(obj)/.. +--- a/drivers/net/wireless/rtl818x/rtl8187/Makefile ++++ b/drivers/net/wireless/rtl818x/rtl8187/Makefile +@@ -2,4 +2,4 @@ rtl8187-objs := dev.o rtl8225.o leds.o + + obj-$(CONFIG_RTL8187) += rtl8187.o + +-ccflags-y += -Idrivers/net/wireless/rtl818x ++ccflags-y += -I$(obj)/.. --- a/drivers/staging/brcm80211/Makefile +++ b/drivers/staging/brcm80211/Makefile @@ -24,10 +24,10 @@ ccflags-y := \ diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh index b93761ef7092..f23c33c40db0 100755 --- a/scripts/admin-update.sh +++ b/scripts/admin-update.sh @@ -229,6 +229,8 @@ DRIVERS="$DRIVERS drivers/net/wireless/zd1211rw" DRIVERS="$DRIVERS drivers/net/wireless/libertas" DRIVERS="$DRIVERS drivers/net/wireless/p54" DRIVERS="$DRIVERS drivers/net/wireless/rtl818x" +DRIVERS="$DRIVERS drivers/net/wireless/rtl818x/rtl8180" +DRIVERS="$DRIVERS drivers/net/wireless/rtl818x/rtl8187" DRIVERS="$DRIVERS drivers/net/wireless/rtlwifi" DRIVERS="$DRIVERS drivers/net/wireless/rtlwifi/rtl8192ce" DRIVERS="$DRIVERS drivers/net/wireless/libertas_tf" -- 2.30.2