* [PATCH 1/3] compat-wireless: make patch apply again. @ 2010-09-15 20:43 Hauke Mehrtens 2010-09-15 20:43 ` [PATCH 2/3] " Hauke Mehrtens 2010-09-15 20:43 ` [PATCH 3/3] compat-wirelsss: add carl9170 Hauke Mehrtens 0 siblings, 2 replies; 6+ messages in thread From: Hauke Mehrtens @ 2010-09-15 20:43 UTC (permalink / raw) To: lrodriguez; +Cc: linux-wireless, mcgrof, Hauke Mehrtens Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- patches/99-change-makefiles.patch | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/patches/99-change-makefiles.patch b/patches/99-change-makefiles.patch index 47f3b5c..c75f4f2 100644 --- a/patches/99-change-makefiles.patch +++ b/patches/99-change-makefiles.patch @@ -13,7 +13,7 @@ only the wireless stuff. obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o --- a/drivers/net/usb/Makefile +++ b/drivers/net/usb/Makefile -@@ -2,27 +2,7 @@ +@@ -2,28 +2,7 @@ # Makefile for USB Network drivers # @@ -40,6 +40,7 @@ only the wireless stuff. -obj-$(CONFIG_USB_CDC_PHONET) += cdc-phonet.o -obj-$(CONFIG_USB_IPHETH) += ipheth.o -obj-$(CONFIG_USB_SIERRA_NET) += sierra_net.o +-obj-$(CONFIG_USB_NET_CX82310_ETH) += cx82310_eth.o --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] compat-wireless: make patch apply again. 2010-09-15 20:43 [PATCH 1/3] compat-wireless: make patch apply again Hauke Mehrtens @ 2010-09-15 20:43 ` Hauke Mehrtens 2010-09-15 22:03 ` Luis R. Rodriguez 2010-09-15 20:43 ` [PATCH 3/3] compat-wirelsss: add carl9170 Hauke Mehrtens 1 sibling, 1 reply; 6+ messages in thread From: Hauke Mehrtens @ 2010-09-15 20:43 UTC (permalink / raw) To: lrodriguez; +Cc: linux-wireless, mcgrof, Hauke Mehrtens Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- ...k-Add-debugfs-interface-to-dump-registers.patch | 25 ++++++++++--------- 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/crap/0001-ath9k-Add-debugfs-interface-to-dump-registers.patch b/crap/0001-ath9k-Add-debugfs-interface-to-dump-registers.patch index d236c46..a6c6d3e 100644 --- a/crap/0001-ath9k-Add-debugfs-interface-to-dump-registers.patch +++ b/crap/0001-ath9k-Add-debugfs-interface-to-dump-registers.patch @@ -42,13 +42,10 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> #ifdef CONFIG_ATH_DEBUG static ssize_t read_file_debug(struct file *file, char __user *user_buf, -@@ -893,7 +907,38 @@ static ssize_t write_file_regval(struct - static const struct file_operations fops_regval = { - .read = read_file_regval, - .write = write_file_regval, -- .open = ath9k_debugfs_open, -+}; -+ +@@ -908,6 +922,40 @@ static const struct file_operations fops + .llseek = default_llseek,/* read accesses f_pos */ + }; + +#define REGDUMP_LINE_SIZE 20 +#define REGDUMP_NUM_REGS (0x16bd4 / 4 + 1) +#define REGDUMP_DATA_LEN (REGDUMP_NUM_REGS * REGDUMP_LINE_SIZE + 1) @@ -79,10 +76,14 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> + .open = open_file_regdump, + .read = ath9k_debugfs_read_buf, + .release = ath9k_debugfs_release_buf, - .owner = THIS_MODULE - }; - -@@ -961,6 +1006,11 @@ int ath9k_init_debug(struct ath_hw *ah) ++ .owner = THIS_MODULE, ++ .llseek = default_llseek,/* read accesses f_pos */ ++}; ++ + int ath9k_init_debug(struct ath_hw *ah) + { + struct ath_common *common = ath9k_hw_common(ah); +@@ -972,6 +1020,11 @@ int ath9k_init_debug(struct ath_hw *ah) goto err; sc->debug.regidx = 0; @@ -94,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> return 0; err: ath9k_exit_debug(ah); -@@ -972,6 +1022,7 @@ void ath9k_exit_debug(struct ath_hw *ah) +@@ -983,6 +1036,7 @@ void ath9k_exit_debug(struct ath_hw *ah) struct ath_common *common = ath9k_hw_common(ah); struct ath_softc *sc = (struct ath_softc *) common->priv; -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] compat-wireless: make patch apply again. 2010-09-15 20:43 ` [PATCH 2/3] " Hauke Mehrtens @ 2010-09-15 22:03 ` Luis R. Rodriguez 0 siblings, 0 replies; 6+ messages in thread From: Luis R. Rodriguez @ 2010-09-15 22:03 UTC (permalink / raw) To: Hauke Mehrtens Cc: Luis Rodriguez, linux-wireless@vger.kernel.org, mcgrof@infradead.org On Wed, Sep 15, 2010 at 01:43:34PM -0700, Hauke Mehrtens wrote: > > Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Thanks! Applied the first two patches, the carl9170 requires a bit more work to ensure we don't oops people's old kernels who require some extra version fixes. Luis ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] compat-wirelsss: add carl9170 2010-09-15 20:43 [PATCH 1/3] compat-wireless: make patch apply again Hauke Mehrtens 2010-09-15 20:43 ` [PATCH 2/3] " Hauke Mehrtens @ 2010-09-15 20:43 ` Hauke Mehrtens 2010-09-15 20:50 ` Christian Lamparter 1 sibling, 1 reply; 6+ messages in thread From: Hauke Mehrtens @ 2010-09-15 20:43 UTC (permalink / raw) To: lrodriguez; +Cc: linux-wireless, mcgrof, Hauke Mehrtens This patch adds upport for carl9170. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- config.mk | 6 +++++ patches/25-multicast-list_head.patch | 42 ++++++++++++++++++++++++++++++++- scripts/admin-update.sh | 1 + 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/config.mk b/config.mk index b61c318..5e7ae1b 100644 --- a/config.mk +++ b/config.mk @@ -411,6 +411,12 @@ CONFIG_AT76C50X_USB=m ifndef CONFIG_COMPAT_KERNEL_28 CONFIG_AR9170_USB=m CONFIG_AR9170_LEDS=y + +CONFIG_CARL9170=m +CONFIG_CARL9170_LEDS=y +# CONFIG_CARL9170_DEBUGFS=y +# CONFIG_CARL9170_WPC=y + endif #CONFIG_COMPAT_KERNEL_28 CONFIG_ATH9K_HTC=m diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index 2869364..5a6bb16 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -69,7 +69,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } --- a/drivers/net/b44.c +++ b/drivers/net/b44.c -@@ -1680,7 +1680,11 @@ static int __b44_load_mcast(struct b44 * +@@ -1689,7 +1689,11 @@ static int __b44_load_mcast(struct b44 * netdev_for_each_mc_addr(ha, dev) { if (i == num_ents) break; @@ -227,6 +227,44 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } return ((u64)(mfilt[1]) << 32) | mfilt[0]; +--- a/drivers/net/wireless/ath/carl9170/main.c ++++ b/drivers/net/wireless/ath/carl9170/main.c +@@ -810,17 +810,35 @@ out: + return err; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + static u64 carl9170_op_prepare_multicast(struct ieee80211_hw *hw, + struct netdev_hw_addr_list *mc_list) ++#else ++static u64 carl9170_op_prepare_multicast(struct ieee80211_hw *hw, int mc_count, ++ struct dev_addr_list *ha) ++#endif + { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr *ha; ++#else ++ int i; ++#endif + u64 mchash; + + /* always get broadcast frames */ + mchash = 1ULL << (0xff >> 2); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + netdev_hw_addr_list_for_each(ha, mc_list) + mchash |= 1ULL << (ha->addr[5] >> 2); ++#else ++ for (i = 0; i < mc_count; i++) { ++ if (WARN_ON(!ha)) ++ break; ++ mchash |= 1ULL << (ha->dmi_addr[5] >> 2); ++ ha = ha->next; ++ } ++#endif + + return mchash; + } --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c @@ -242,18 +242,34 @@ static int lbs_add_mcast_addrs(struct cm @@ -693,7 +731,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 spin_unlock_bh(&local->filter_lock); /* be a bit nasty */ -@@ -521,9 +525,11 @@ struct ieee80211_hw *ieee80211_alloc_hw( +@@ -524,9 +528,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/scripts/admin-update.sh b/scripts/admin-update.sh index 6ef281d..ac9470d 100755 --- a/scripts/admin-update.sh +++ b/scripts/admin-update.sh @@ -192,6 +192,7 @@ fi # Drivers that have their own directory DRIVERS="drivers/net/wireless/ath" +DRIVERS="$DRIVERS drivers/net/wireless/ath/carl9170" DRIVERS="$DRIVERS drivers/net/wireless/ath/ar9170" DRIVERS="$DRIVERS drivers/net/wireless/ath/ath5k" DRIVERS="$DRIVERS drivers/net/wireless/ath/ath9k" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] compat-wirelsss: add carl9170 2010-09-15 20:43 ` [PATCH 3/3] compat-wirelsss: add carl9170 Hauke Mehrtens @ 2010-09-15 20:50 ` Christian Lamparter 2010-09-15 21:11 ` Luis R. Rodriguez 0 siblings, 1 reply; 6+ messages in thread From: Christian Lamparter @ 2010-09-15 20:50 UTC (permalink / raw) To: Hauke Mehrtens; +Cc: lrodriguez, linux-wireless, mcgrof On Wednesday 15 September 2010 22:43:35 Hauke Mehrtens wrote: > This patch adds upport for carl9170. > > Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> NACK usb_get_from_anchor is not thread-safe on older kernel. See details: https://patchwork.kernel.org/patch/118946/ > --- > config.mk | 6 +++++ > patches/25-multicast-list_head.patch | 42 ++++++++++++++++++++++++++++++++- > scripts/admin-update.sh | 1 + > 3 files changed, 47 insertions(+), 2 deletions(-) > > diff --git a/config.mk b/config.mk > index b61c318..5e7ae1b 100644 > --- a/config.mk > +++ b/config.mk > @@ -411,6 +411,12 @@ CONFIG_AT76C50X_USB=m > ifndef CONFIG_COMPAT_KERNEL_28 > CONFIG_AR9170_USB=m > CONFIG_AR9170_LEDS=y > + > +CONFIG_CARL9170=m > +CONFIG_CARL9170_LEDS=y > +# CONFIG_CARL9170_DEBUGFS=y > +# CONFIG_CARL9170_WPC=y > + > endif #CONFIG_COMPAT_KERNEL_28 > > CONFIG_ATH9K_HTC=m > diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch > index 2869364..5a6bb16 100644 > --- a/patches/25-multicast-list_head.patch > +++ b/patches/25-multicast-list_head.patch > @@ -69,7 +69,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 > } > --- a/drivers/net/b44.c > +++ b/drivers/net/b44.c > -@@ -1680,7 +1680,11 @@ static int __b44_load_mcast(struct b44 * > +@@ -1689,7 +1689,11 @@ static int __b44_load_mcast(struct b44 * > netdev_for_each_mc_addr(ha, dev) { > if (i == num_ents) > break; > @@ -227,6 +227,44 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 > } > > return ((u64)(mfilt[1]) << 32) | mfilt[0]; > +--- a/drivers/net/wireless/ath/carl9170/main.c > ++++ b/drivers/net/wireless/ath/carl9170/main.c > +@@ -810,17 +810,35 @@ out: > + return err; > + } > + > ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) > + static u64 carl9170_op_prepare_multicast(struct ieee80211_hw *hw, > + struct netdev_hw_addr_list *mc_list) > ++#else > ++static u64 carl9170_op_prepare_multicast(struct ieee80211_hw *hw, int mc_count, > ++ struct dev_addr_list *ha) > ++#endif > + { > ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) > + struct netdev_hw_addr *ha; > ++#else > ++ int i; > ++#endif > + u64 mchash; > + > + /* always get broadcast frames */ > + mchash = 1ULL << (0xff >> 2); > + > ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) > + netdev_hw_addr_list_for_each(ha, mc_list) > + mchash |= 1ULL << (ha->addr[5] >> 2); > ++#else > ++ for (i = 0; i < mc_count; i++) { > ++ if (WARN_ON(!ha)) > ++ break; > ++ mchash |= 1ULL << (ha->dmi_addr[5] >> 2); > ++ ha = ha->next; > ++ } > ++#endif > + > + return mchash; > + } > --- a/drivers/net/wireless/libertas/main.c > +++ b/drivers/net/wireless/libertas/main.c > @@ -242,18 +242,34 @@ static int lbs_add_mcast_addrs(struct cm > @@ -693,7 +731,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 > spin_unlock_bh(&local->filter_lock); > > /* be a bit nasty */ > -@@ -521,9 +525,11 @@ struct ieee80211_hw *ieee80211_alloc_hw( > +@@ -524,9 +528,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/scripts/admin-update.sh b/scripts/admin-update.sh > index 6ef281d..ac9470d 100755 > --- a/scripts/admin-update.sh > +++ b/scripts/admin-update.sh > @@ -192,6 +192,7 @@ fi > > # Drivers that have their own directory > DRIVERS="drivers/net/wireless/ath" > +DRIVERS="$DRIVERS drivers/net/wireless/ath/carl9170" > DRIVERS="$DRIVERS drivers/net/wireless/ath/ar9170" > DRIVERS="$DRIVERS drivers/net/wireless/ath/ath5k" > DRIVERS="$DRIVERS drivers/net/wireless/ath/ath9k" > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] compat-wirelsss: add carl9170 2010-09-15 20:50 ` Christian Lamparter @ 2010-09-15 21:11 ` Luis R. Rodriguez 0 siblings, 0 replies; 6+ messages in thread From: Luis R. Rodriguez @ 2010-09-15 21:11 UTC (permalink / raw) To: Christian Lamparter Cc: Hauke Mehrtens, Luis Rodriguez, linux-wireless@vger.kernel.org, mcgrof@infradead.org On Wed, Sep 15, 2010 at 01:50:56PM -0700, Christian Lamparter wrote: > On Wednesday 15 September 2010 22:43:35 Hauke Mehrtens wrote: > > This patch adds upport for carl9170. > > > > Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> > NACK > > usb_get_from_anchor is not thread-safe on older kernel. > See details: > > https://patchwork.kernel.org/patch/118946/ Why is this not a stable fix? And for what kernel was this patch merged for? Luis ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-09-15 22:03 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-09-15 20:43 [PATCH 1/3] compat-wireless: make patch apply again Hauke Mehrtens 2010-09-15 20:43 ` [PATCH 2/3] " Hauke Mehrtens 2010-09-15 22:03 ` Luis R. Rodriguez 2010-09-15 20:43 ` [PATCH 3/3] compat-wirelsss: add carl9170 Hauke Mehrtens 2010-09-15 20:50 ` Christian Lamparter 2010-09-15 21:11 ` Luis R. Rodriguez
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).