One more patch... -- Re: Please pull 'upstream-jgarzik' branch of wireless-2.6
On Tue, Jan 08, 2008 at 05:23:05PM -0500, John W. Linville wrote:
Jeff,
Another round of patches intended for 2.6.25...the biggest factions are
rt2x00 and b43 updates, as well as some Viro-isms... :-)
Please let me know if there are any problems!
John
P.S. Copying Dave in case he is handling these requests...FWIW, it
will definitely depend on the patches already in netdev-2.6#upstream...
I left out a patch. I have pushed it on top of the previous request.
Let me know if there are problems!
Thanks,
John
---
The following changes since commit f94de7b013f78ad8bbe1064c108dd55141efb177:
Miguel Botón (1):
iwlwifi: fix compilation warning in 'iwl-4965.c'
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
upstream-jgarzik
Michael Buesch (1):
zd1211rw: fix alignment for QOS and WDS frames
drivers/net/wireless/zd1211rw/zd_mac.c | 17 -
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c
b/drivers/net/wireless/zd1211rw/zd_mac.c
index 14fb727..7b86930 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -623,6 +623,8 @@ int zd_mac_rx(struct ieee80211_hw *hw, const u8 *buffer,
unsigned int length)
const struct rx_status *status;
struct sk_buff *skb;
int bad_frame = 0;
+ u16 fc;
+ bool is_qos, is_4addr, need_padding;
if (length ZD_PLCP_HEADER_SIZE + 10 /* IEEE80211_1ADDR_LEN */ +
FCS_LEN + sizeof(struct rx_status))
@@ -674,9 +676,22 @@ int zd_mac_rx(struct ieee80211_hw *hw, const u8 *buffer,
unsigned int length)
!mac-pass_ctrl)
return 0;
- skb = dev_alloc_skb(length);
+ fc = le16_to_cpu(*((__le16 *) buffer));
+
+ is_qos = ((fc IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA)
+((fc IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_QOS_DATA);
+ is_4addr = (fc (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
+ (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS);
+ need_padding = is_qos ^ is_4addr;
+
+ skb = dev_alloc_skb(length + (need_padding ? 2 : 0));
if (skb == NULL)
return -ENOMEM;
+ if (need_padding) {
+ /* Make sure the the payload data is 4 byte aligned. */
+ skb_reserve(skb, 2);
+ }
+
memcpy(skb_put(skb, length), buffer, length);
ieee80211_rx_irqsafe(hw, skb, stats);
--
John W. Linville
[EMAIL PROTECTED]
--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Belay that... -- Re: Please pull 'upstream-jgarzik' branch of wireless-2.6
Please don't pull yet -- I let a patch get in out of order. I'll post a new pull request when I straighten this out... John On Tue, Jan 08, 2008 at 05:42:02PM -0500, John W. Linville wrote: On Tue, Jan 08, 2008 at 05:23:05PM -0500, John W. Linville wrote: Jeff, Another round of patches intended for 2.6.25...the biggest factions are rt2x00 and b43 updates, as well as some Viro-isms... :-) Please let me know if there are any problems! John P.S. Copying Dave in case he is handling these requests...FWIW, it will definitely depend on the patches already in netdev-2.6#upstream... I left out a patch. I have pushed it on top of the previous request. Let me know if there are problems! Thanks, John -- John W. Linville [EMAIL PROTECTED] -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Please pull 'upstream-jgarzik' branch of wireless-2.6
Hum, this required merging also, and broke the build too :/ drivers/net/wireless/iwlwifi/iwl3945-base.c: In function ‘iwl3945_alive_start’: drivers/net/wireless/iwlwifi/iwl3945-base.c:6285: error: implicit declaration of function ‘iwl_rate_control_unregister’ make[4]: *** [drivers/net/wireless/iwlwifi/iwl3945-base.o] Error 1 make[3]: *** [drivers/net/wireless/iwlwifi] Error 2 make[2]: *** [drivers/net/wireless] Error 2 make[1]: *** [drivers/net] Error 2 make: *** [drivers] Error 2 I'll leave it there and assume that you will send a fix --on top of-- netdev#upstream ... -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Please pull 'upstream-jgarzik' branch of wireless-2.6
On Mon, 2007-12-17 at 18:40 -0500, Jeff Garzik wrote: drivers/net/wireless/iwlwifi/iwl3945-base.c: In function ‘iwl3945_alive_start’: drivers/net/wireless/iwlwifi/iwl3945-base.c:6285: error: implicit declaration of function ‘iwl_rate_control_unregister’ make[4]: *** [drivers/net/wireless/iwlwifi/iwl3945-base.o] Error 1 make[3]: *** [drivers/net/wireless/iwlwifi] Error 2 make[2]: *** [drivers/net/wireless] Error 2 make[1]: *** [drivers/net] Error 2 make: *** [drivers] Error 2 We changed the namespace between 2.6.24 and upstream. So iwl_rate_control_unregister should be renamed to iwl3945_rate_control_unregister when the patch is merged from fix-jgarzik to upstream-jgarzik. The same thing is also for iwl4965_rate_control_unregister. I'll leave it there and assume that you will send a fix --on top of-- netdev#upstream ... I assume John will do it. Thanks, -yi -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Please pull 'upstream-jgarzik' branch of wireless-2.6
On Tue, Nov 27, 2007 at 09:47:48AM -0500, John W. Linville wrote: A slew of patches for 2.6.25... Disregard this request -- new request coming shortly. John -- John W. Linville [EMAIL PROTECTED] -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Please pull 'upstream-jgarzik' branch of wireless-2.6
John W. Linville wrote: Jeff, Here are more than 5 score patches intended for 2.6.25. This request replaces the request sent on 27 November. [1] There are tons of updates here, especially iwlwifi and libertas. The b43, b43legacy, rt2x00, rtl8187, and zd1211rw drivers are also updated. This pull contains the port of zd1211rw to the mac80211 infrastructure. There is also some SSB stuff in there. I've been sending that stuff to Dave M., but since later b43 patches depend on it I thought it would be better to send them your way. I'll CC Dave. Also included is the iwl4965 work to use the .11n stuff that has been added in the net-2.6.25 tree. For now I've added a depends on n to the IWL4965_HT Kconfig to avoid build breakage in your tree. The total diff is getting big -- the patch is nearing 2MB. Please let me know if there are any problems so we can get (at least some of) this merged! Thanks, John [1] http://marc.info/?l=linux-netdevm=119617493212177w=2 --- Individual patches are available here: http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/upstream-jgarzik --- The following changes since commit e86d91426d8b3d79010c9d5c617d7594e5c165aa: Jeff Garzik (1): Merge branch 'r6040' of git://git.kernel.org/.../romieu/netdev-2.6 into upstream are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-jgarzik pulled -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Please pull 'upstream-jgarzik' branch of wireless-2.6
John W. Linville wrote: Jeff, Here is a slew of patches targeted for 2.6.25. There are a bunch of rt2x00, iwl3945, iwl4965, b43, and b43legacy patches, as well as a few others. I'm sorry I didn't spread this out better -- I got a bit behind... :-( Thanks, John --- Individual patches are available here: http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/upstream-jgarzik/ pulled - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Please pull 'upstream-jgarzik' branch of wireless-2.6
On Sat, 2007-09-15 at 09:21 -0400, John W. Linville wrote: Jeff, A few more for 2.6.24... Hi John, how is the iwlwifi driver going? Would you like to push it to Jeff for .24? Or you'd like me to create a patch against this branch? Thanks, -yi - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Please pull 'upstream-jgarzik' branch of wireless-2.6
John W. Linville wrote: Jeff, A few more for 2.6.24 -- mostly libertas. Individual patches are available here: http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/upstream-jgarzik/ Thanks! John --- The following changes since commit e54cfa621f4cca9cca500019aa600c71d20f0592: Jeff Garzik (1): Merge branch 'upstream-jgarzik' of git://git.kernel.org/.../linville/wireless-2.6 into upstream are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-jgarzik Andrew Morton (1): libertas: printk warning fixes Brajesh Dave (1): libertas: advertise 11g ad-hoc rates Dan Williams (4): libertas: fix inadvertant removal of bits from commit 831441862956fffa17b9801db37e6ea1650b0f69 libertas: reorganize and simplify init sequence libertas: don't stomp on interface-specific private data libertas: send reset command directly instead of calling libertas_reset_device Jesper Juhl (1): net: Kill some unneeded allocation return value casts in libertas Johannes Berg (1): rtl8187: remove IEEE80211_HW_DATA_NULLFUNC_ACK John W. Linville (1): libertas: remove unused adhoc_rates_b definition Marek Vašut (1): libertas: region code values specified as 8bit Pierre Ossman (1): libertas: properly end commands on hardware failure drivers/net/wireless/libertas/cmd.c |2 + drivers/net/wireless/libertas/cmdresp.c |6 +- drivers/net/wireless/libertas/debugfs.c |2 +- drivers/net/wireless/libertas/decl.h|3 +- drivers/net/wireless/libertas/dev.h |4 - drivers/net/wireless/libertas/ethtool.c |3 +- drivers/net/wireless/libertas/if_cs.c | 58 + drivers/net/wireless/libertas/if_usb.c | 371 + drivers/net/wireless/libertas/if_usb.h |4 +- drivers/net/wireless/libertas/join.c|7 +- drivers/net/wireless/libertas/main.c| 408 +-- drivers/net/wireless/rtl8187_dev.c |3 +- 12 files changed, 354 insertions(+), 517 deletions(-) pulled - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Please pull 'upstream-jgarzik' branch of wireless-2.6
John W. Linville wrote: A few items intended for 2.6.24. Individual patches here: http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/upstream-jgarzik/ Thanks! John --- The following changes since commit 39d3520c92cf7a28c07229ca00cc35a1e8026c77: Linus Torvalds (1): Linux 2.6.23-rc3 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-jgarzik Daniel Drake (2): zd1211rw: Add ID for Sitecom WL-162 zd1211rw: Add ID for ZyXEL M-202 XtremeMIMO Mariusz Kozlowski (1): drivers/net/wireless/wl3501_cs.c: remove redundant memset Ulrich Kunitz (2): zd1211rw: removed noisy debug messages zd1211rw: consistent handling of ZD1211 specific rates drivers/net/wireless/wl3501_cs.c |1 - drivers/net/wireless/zd1211rw/zd_chip.c | 69 +++--- drivers/net/wireless/zd1211rw/zd_ieee80211.h | 43 +++ drivers/net/wireless/zd1211rw/zd_mac.c | 99 +++--- drivers/net/wireless/zd1211rw/zd_mac.h | 65 +++-- drivers/net/wireless/zd1211rw/zd_usb.c |2 + 6 files changed, 128 insertions(+), 151 deletions(-) pulled - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Please pull 'upstream-jgarzik' branch of wireless-2.6
John W. Linville wrote: These are intended for 2.6.24... --- The following changes since commit fdc8f43b5e49b64b251bb48da95193a13ac0132f: Michael Buesch (1): softmac: Fix deadlock of wx_set_essid with assoc work are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-jgarzik Bill Nottingham (1): remove gratuitous space in airo module description Faidon Liambotis (2): Kconfig: order options Kconfig: remove references of pcmcia-cs Mariusz Kozlowski (1): drivers/net/wireless/prism54/oid_mgt.c: kmalloc + memset conversion to kzalloc Matthias Kaehlcke (1): Use mutex instead of semaphore in the Host AP driver Ulrich Kunitz (1): zd1211rw: monitor all packets Yoann Padioleau (1): dev-priv to netdev_priv(dev), for drivers/net/wireless drivers/net/wireless/Kconfig | 85 +++ drivers/net/wireless/airo.c|4 +- drivers/net/wireless/arlan-proc.c | 14 ++-- drivers/net/wireless/hostap/hostap_cs.c|2 +- drivers/net/wireless/hostap/hostap_hw.c| 16 +++--- drivers/net/wireless/hostap/hostap_ioctl.c | 14 ++-- drivers/net/wireless/hostap/hostap_wlan.h |3 +- drivers/net/wireless/orinoco_tmd.c |2 +- drivers/net/wireless/prism54/isl_ioctl.c |6 +- drivers/net/wireless/prism54/oid_mgt.c |4 +- drivers/net/wireless/ray_cs.c | 66 +++--- drivers/net/wireless/strip.c |2 +- drivers/net/wireless/wl3501_cs.c | 66 +++--- drivers/net/wireless/zd1211rw/zd_chip.h|5 -- drivers/net/wireless/zd1211rw/zd_mac.c | 44 -- 15 files changed, 172 insertions(+), 161 deletions(-) pulled into #upstream - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Please pull 'upstream-jgarzik' branch of wireless-2.6
John W. Linville wrote: A few more for 2.6.23... Thanks! John --- The following changes since commit 4ad1366376bfef32ec0ffa12d1faa483d6f330bd: NeilBrown (1): md: change bitmap_unplug and others to void functions are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-jgarzik Daniel Drake (1): zd1211rw: Add ID for Siemens Gigaset USB Stick 54 Jean Tourrilhes (1): softmac: Channel is listed twice in scan output Masakazu Mokuno (1): zd1211rw: Add ID for Planex GW-US54GXS Zhu Yi (4): ipw2100: Fix `iwpriv set_power` error Fix ipw2200 set wrong power parameter causing firmware error ipw2200: Fix ipw_isr() comments error on shared IRQ Update version ipw2200 stamp to 1.2.2 drivers/net/wireless/ipw2100.c |6 +++--- drivers/net/wireless/ipw2200.c | 18 -- drivers/net/wireless/zd1211rw/zd_usb.c |2 ++ net/ieee80211/ieee80211_wx.c |7 ++- 4 files changed, 15 insertions(+), 18 deletions(-) pulled - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Please pull 'upstream-jgarzik' branch of wireless-2.6
John W. Linville wrote: The following changes since commit 71780f59e127bb281a9302d430495ca9586c14e7: Linus Torvalds (1): Merge branch 'for-linus' of git://git.kernel.org/.../ieee1394/linux1394-2.6 are found in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-jgarzik Adrian Bunk (1): drivers/net/wireless/libertas/wext.c: remove dead code Dan Williams (1): libertas: fix disabling WPA Daniel Drake (4): zd1211rw: Allow channels 1-11 for unrecognised regulatory domains zd1211rw: Detect more AL2230S radios zd1211rw: Add ID for Buffalo WLI-U2-KG54L zd1211rw: Defer firmware load until first ifup Holger Schurig (1): libertas: fix use-after-free in rx path Jean Tourrilhes (1): softmac: Fix ESSID problem Matthias Kaehlcke (1): use list_for_each_entry() for iteration in Prism 54 driver Michael Wu (1): rtl8187: fix endianness issue in rtl8225 register writing Michal Schmidt (5): airo: disable the PCI device when unloading module airo: delay some initialization until the netdev is up airo: fix a race causing initialization failures airo: simpler calling convention for enable_MAC() airo: start with radio off Robert P. J. Day (1): WIRELESS: Remove clearly obsolete libertas/version.h file. Stephen Hemminger (2): ipw2200: rf kill switch polling power saving ipw2100: RF kill switch timer power save pulled - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
