* [PATCH 0/1] compat-wireless: wl1271->wl12xx rename @ 2010-11-22 15:00 luciano.coelho 2010-11-22 15:00 ` [PATCH 1/1] compat-wireless: apply changes needed after wl1271->wl12xx renaming luciano.coelho 0 siblings, 1 reply; 6+ messages in thread From: luciano.coelho @ 2010-11-22 15:00 UTC (permalink / raw) To: Luis R. Rodriguez; +Cc: linux-wireless From: Luciano Coelho <luciano.coelho@nokia.com> Hi Luis, I've just sent a pull-request to John with the patch that renames wl1271 to wl12xx and renames some files accordingly. This breaks compat-wireless as we discussed before, so I have already created this patch that fixes the problems caused by the renaming. Once the wl12xx rename patch reaches linux-next, you can apply this to the compat-wireless tree. Thanks! Cheers, Luca. Luciano Coelho (1): compat-wireless: apply changes needed after wl1271->wl12xx renaming Makefile | 4 ++-- README | 2 +- patches/06-header-changes.patch | 4 ++-- patches/25-multicast-list_head.patch | 4 ++-- scripts/driver-select | 6 +++--- scripts/unload.sh | 2 +- scripts/wlunload.sh | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/1] compat-wireless: apply changes needed after wl1271->wl12xx renaming 2010-11-22 15:00 [PATCH 0/1] compat-wireless: wl1271->wl12xx rename luciano.coelho @ 2010-11-22 15:00 ` luciano.coelho 2010-11-22 18:13 ` Luis R. Rodriguez 0 siblings, 1 reply; 6+ messages in thread From: luciano.coelho @ 2010-11-22 15:00 UTC (permalink / raw) To: Luis R. Rodriguez; +Cc: linux-wireless From: Luciano Coelho <luciano.coelho@nokia.com> This patch changes the occurrences of wl1271 in the Makefile, README and in the scripts to wl12xx, since the driver has been renamed. Also remove the wl1271_ prefix from the filenames. Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> --- Makefile | 4 ++-- README | 2 +- patches/06-header-changes.patch | 4 ++-- patches/25-multicast-list_head.patch | 4 ++-- scripts/driver-select | 6 +++--- scripts/unload.sh | 2 +- scripts/wlunload.sh | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index db9c836..aab3cdf 100644 --- a/Makefile +++ b/Makefile @@ -276,7 +276,7 @@ install-scripts: @$(MODPROBE) -l usb8xxx @$(MODPROBE) -l usbnet @$(MODPROBE) -l wl1251 - @$(MODPROBE) -l wl1271 + @$(MODPROBE) -l wl12xx @$(MODPROBE) -l zd1211rw @echo @echo "Currently detected ethernet subsystem modules:" @@ -405,7 +405,7 @@ uninstall: @$(MODPROBE) -l usb8xxx @$(MODPROBE) -l usbnet @$(MODPROBE) -l wl1251 - @$(MODPROBE) -l wl1271 + @$(MODPROBE) -l wl12xx @$(MODPROBE) -l zd1211rw @echo @echo "Your old ethernet subsystem modules are left intact:" diff --git a/README b/README index d537290..d1c7884 100644 --- a/README +++ b/README @@ -162,7 +162,7 @@ rtl8187 spectrum_cs ssb wl1251 -wl1271 +wl12xx zd1211rw This package also provides more drivers which may be documented here diff --git a/patches/06-header-changes.patch b/patches/06-header-changes.patch index 1ab2b27..8d06c91 100644 --- a/patches/06-header-changes.patch +++ b/patches/06-header-changes.patch @@ -50,8 +50,8 @@ cases. #include <linux/spi/spi.h> #include <linux/wl12xx.h> ---- a/drivers/net/wireless/wl12xx/wl1271_boot.c -+++ b/drivers/net/wireless/wl12xx/wl1271_boot.c +--- a/drivers/net/wireless/wl12xx/boot.c ++++ b/drivers/net/wireless/wl12xx/boot.c @@ -21,7 +21,6 @@ * */ diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index aa6fc2a..f84da2c 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -499,8 +499,8 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } static void rtl8187_configure_filter(struct ieee80211_hw *dev, ---- a/drivers/net/wireless/wl12xx/wl1271_main.c -+++ b/drivers/net/wireless/wl12xx/wl1271_main.c +--- a/drivers/net/wireless/wl12xx/main.c ++++ b/drivers/net/wireless/wl12xx/main.c @@ -1410,11 +1410,20 @@ struct wl1271_filter_params { u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN]; }; diff --git a/scripts/driver-select b/scripts/driver-select index ef2b9a7..611e6e1 100755 --- a/scripts/driver-select +++ b/scripts/driver-select @@ -30,7 +30,7 @@ PURPLE="\033[35m" CYAN="\033[36m" UNDERLINE="\033[02m" -SUPPORTED_80211_DRIVERS="ath5k ath9k ath9k_htc carl9170 b43 zd1211rw rt2x00 wl1251 wl1271" +SUPPORTED_80211_DRIVERS="ath5k ath9k ath9k_htc carl9170 b43 zd1211rw rt2x00 wl1251 wl12xx" if [ -d drivers/staging/ath6kl ]; then SUPPORTED_80211_DRIVERS="$SUPPORTED_80211_DRIVERS ath6kl" @@ -60,7 +60,7 @@ function usage { echo -e "\t${CYAN}intel${NORMAL} < ${PURPLE} iwl3945 iwlagn ipw2100 ipw2200 ${NORMAL}>" echo -e "\t${CYAN}iwlwifi${NORMAL} < ${PURPLE} iwl3945 iwlagn ${NORMAL}>" echo -e "\t${CYAN}rtl818x${NORMAL} < ${PURPLE} rtl8180 rtl8187 ${NORMAL}>" - echo -e "\t${CYAN}wl12xx${NORMAL} < ${PURPLE} wl1251 wl1271 (SPI and SDIO)${NORMAL}>" + echo -e "\t${CYAN}wl12xx${NORMAL} < ${PURPLE} wl1251 wl12xx (SPI and SDIO)${NORMAL}>" echo -e "\nSupported group drivers: Bluetooth & Ethernet:" echo -e "\t${BLUE}atlxx${NORMAL} < ${PURPLE} atl1 atl2 atl1e atl1c ${NORMAL}>" @@ -398,7 +398,7 @@ case $1 in disable_staging disable_var_01 ;; - wl1271) + wl12xx) select_drivers CONFIG_WL12XX disable_staging disable_var_01 diff --git a/scripts/unload.sh b/scripts/unload.sh index b7fd8cb..52ad551 100755 --- a/scripts/unload.sh +++ b/scripts/unload.sh @@ -8,7 +8,7 @@ OLD_MODULES="$OLD_MODULES ieee80211softmac ieee80211_crypt ieee80211" OLD_MODULES="$OLD_MODULES bcm43xx rndis_wext iwl4965" MODULES="$OLD_MODULES" MODULES="$MODULES ipw2100 ipw2200 libipw" -MODULES="$MODULES wl1251 wl1271 iwmc3200wifi" +MODULES="$MODULES wl1251 wl12xx iwmc3200wifi" MODULES="$MODULES libertas_cs usb8xxx libertas libertas_sdio libertas_spi" MODULES="$MODULES libertas_tf libertas_tf_usb" MODULES="$MODULES adm8211 zd1211rw" diff --git a/scripts/wlunload.sh b/scripts/wlunload.sh index 8add614..ca7e429 100755 --- a/scripts/wlunload.sh +++ b/scripts/wlunload.sh @@ -8,7 +8,7 @@ OLD_MODULES="$OLD_MODULES ieee80211softmac ieee80211_crypt ieee80211" OLD_MODULES="$OLD_MODULES bcm43xx rndis_wext iwl4965" MODULES="$OLD_MODULES" MODULES="$MODULES ipw2100 ipw2200 libipw" -MODULES="$MODULES wl1251 wl1271 iwmc3200wifi" +MODULES="$MODULES wl1251 wl12xx iwmc3200wifi" MODULES="$MODULES libertas_cs usb8xxx libertas libertas_sdio libertas_spi" MODULES="$MODULES libertas_tf libertas_tf_usb" MODULES="$MODULES adm8211 zd1211rw" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] compat-wireless: apply changes needed after wl1271->wl12xx renaming 2010-11-22 15:00 ` [PATCH 1/1] compat-wireless: apply changes needed after wl1271->wl12xx renaming luciano.coelho @ 2010-11-22 18:13 ` Luis R. Rodriguez 2010-11-24 9:53 ` Luciano Coelho 0 siblings, 1 reply; 6+ messages in thread From: Luis R. Rodriguez @ 2010-11-22 18:13 UTC (permalink / raw) To: luciano.coelho; +Cc: linux-wireless On Mon, Nov 22, 2010 at 7:00 AM, <luciano.coelho@nokia.com> wrote: > From: Luciano Coelho <luciano.coelho@nokia.com> > > This patch changes the occurrences of wl1271 in the Makefile, README and in > the scripts to wl12xx, since the driver has been renamed. > > Also remove the wl1271_ prefix from the filenames. > > Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Applied and pushed, thanks! Luis ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] compat-wireless: apply changes needed after wl1271->wl12xx renaming 2010-11-22 18:13 ` Luis R. Rodriguez @ 2010-11-24 9:53 ` Luciano Coelho 2010-11-24 16:58 ` Luis R. Rodriguez 0 siblings, 1 reply; 6+ messages in thread From: Luciano Coelho @ 2010-11-24 9:53 UTC (permalink / raw) To: ext Luis R. Rodriguez; +Cc: linux-wireless Hi Luis, On Mon, 2010-11-22 at 10:13 -0800, ext Luis R. Rodriguez wrote: > On Mon, Nov 22, 2010 at 7:00 AM, <luciano.coelho@nokia.com> wrote: > > From: Luciano Coelho <luciano.coelho@nokia.com> > > > > This patch changes the occurrences of wl1271 in the Makefile, README and in > > the scripts to wl12xx, since the driver has been renamed. > > > > Also remove the wl1271_ prefix from the filenames. > > > > Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> > > Applied and pushed, thanks! It seems that the wl12xx file name changes are now in linux-next. I guess it's okay to include this patch in compat-wireless now. Sorry for the trouble! -- Cheers, Luca. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] compat-wireless: apply changes needed after wl1271->wl12xx renaming 2010-11-24 9:53 ` Luciano Coelho @ 2010-11-24 16:58 ` Luis R. Rodriguez 2010-11-24 19:33 ` Luciano Coelho 0 siblings, 1 reply; 6+ messages in thread From: Luis R. Rodriguez @ 2010-11-24 16:58 UTC (permalink / raw) To: Luciano Coelho; +Cc: linux-wireless On Wed, Nov 24, 2010 at 1:53 AM, Luciano Coelho <luciano.coelho@nokia.com> wrote: > Hi Luis, > > > On Mon, 2010-11-22 at 10:13 -0800, ext Luis R. Rodriguez wrote: >> On Mon, Nov 22, 2010 at 7:00 AM, <luciano.coelho@nokia.com> wrote: >> > From: Luciano Coelho <luciano.coelho@nokia.com> >> > >> > This patch changes the occurrences of wl1271 in the Makefile, README and in >> > the scripts to wl12xx, since the driver has been renamed. >> > >> > Also remove the wl1271_ prefix from the filenames. >> > >> > Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> >> >> Applied and pushed, thanks! > > It seems that the wl12xx file name changes are now in linux-next. I > guess it's okay to include this patch in compat-wireless now. > > Sorry for the trouble! Its already there, thanks! Luis ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] compat-wireless: apply changes needed after wl1271->wl12xx renaming 2010-11-24 16:58 ` Luis R. Rodriguez @ 2010-11-24 19:33 ` Luciano Coelho 0 siblings, 0 replies; 6+ messages in thread From: Luciano Coelho @ 2010-11-24 19:33 UTC (permalink / raw) To: ext Luis R. Rodriguez; +Cc: linux-wireless On Wed, 2010-11-24 at 08:58 -0800, ext Luis R. Rodriguez wrote: > On Wed, Nov 24, 2010 at 1:53 AM, Luciano Coelho > <luciano.coelho@nokia.com> wrote: > > Hi Luis, > > > > > > On Mon, 2010-11-22 at 10:13 -0800, ext Luis R. Rodriguez wrote: > >> On Mon, Nov 22, 2010 at 7:00 AM, <luciano.coelho@nokia.com> wrote: > >> > From: Luciano Coelho <luciano.coelho@nokia.com> > >> > > >> > This patch changes the occurrences of wl1271 in the Makefile, README and in > >> > the scripts to wl12xx, since the driver has been renamed. > >> > > >> > Also remove the wl1271_ prefix from the filenames. > >> > > >> > Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> > >> > >> Applied and pushed, thanks! > > > > It seems that the wl12xx file name changes are now in linux-next. I > > guess it's okay to include this patch in compat-wireless now. > > > > Sorry for the trouble! > > Its already there, thanks! Ah, yes, now I see that you have already reverted the revert ;) Thanks, dude! -- Cheers, Luca. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-11-24 19:34 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-11-22 15:00 [PATCH 0/1] compat-wireless: wl1271->wl12xx rename luciano.coelho 2010-11-22 15:00 ` [PATCH 1/1] compat-wireless: apply changes needed after wl1271->wl12xx renaming luciano.coelho 2010-11-22 18:13 ` Luis R. Rodriguez 2010-11-24 9:53 ` Luciano Coelho 2010-11-24 16:58 ` Luis R. Rodriguez 2010-11-24 19:33 ` Luciano Coelho
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).