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
Please pull 'upstream-jgarzik' branch of wireless-2.6 (use this one)
[ 2nd try...more thoroughly checked... ] 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... --- Individual patches are available here: http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/upstream-jgarzik --- The following changes since commit 65d0aa09c183ee45dc1786675209313fa75cf4ec: Jeff Garzik (1): wireless/iwl: fix namespace breakage are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-jgarzik Al Viro (35): eliminate byteswapping in struct ieee80211_qos_parameters several missing cpu_to_le16() in ieee80211softmac_capabilities() ieee80211softmac_auth_resp() fix ieee80211: fix misannotations ieee80211: beacon-capability is little-endian airo: fix transmit_802_11_packet() airo: fix endianness bug in -dBm handling airo: bug in airo_interrupt() handling on incoming 802.11 airo endianness bug: cap_rid.extSoftCap airo: fix writerids() endianness hostap: fix endianness with txdesc-sw_support p54common annotations and fixes ipw2100 annotations and fixes ray_cs fixes ipw2200 fix: struct ieee80211_radiotap_header is little-endian ipw2200 fix: -rt_chbitmask is le16 ipw2200: ipw_tx_skb() endianness bug airo: trivial endianness annotations airo: sanitize handling of SSID_rid bap_read()/bap_write() work with fixed-endian buffers airo: sanitize BSSListRid handling airo: sanitize handling of WepKeyRid airo: sanitize handling of StatsRid airo: sanitize handling of CapabilityRid airo: sanitize APListRid handling airo: sanitize handling of StatusRid airo: last of endianness annotations hostap annotations hostap: don't mess with mixed-endian even for internal skb queues p54pci: endianness annotations and fixes bcm43xx annotations prism54 trivial annotations ipw2200 trivial annotations ipw2200: do not byteswap struct ipw_associate misc wireless annotations Daniel Walker (1): prism54: remove questionable down_interruptible usage Ivo van Doorn (12): rt2x00: Fix chipset debugfs file rt2x00: Always call ieee80211_stop_queue() when return NETDEV_TX_BUSY rt2x00: Only set the TBCN flag when the interface is configured to send beacons. rt2x00: Store queue idx and entry idx in data_ring and data_entry rt2x00: Move start() and stop() handlers into rt2x00lib.c rt2x00: Put 802.11 data on 4 byte boundary rt2x00: Move packet filter flags rt2x00: Cleanup write_tx_desc() arguments rt2x00: Determine MY_BSS from descriptor rt2x00: Move init_txring and init_rxring into rt2x00lib rt2x00: Correctly initialize data and desc pointer rt2x00: Release rt2x00 2.0.14 John W. Linville (1): Revert rtl8187: fix tx power reading Michael Buesch (10): ssb: Fix extraction of values from SPROM b43: Only select allowed TX and RX antennas b43: Fix chip access validation for new devices ssb: Fix PCMCIA lowlevel register access b43: Remove PIO support b43: Add definitions for MAC Control register b43-ssb-bridge: Add PCI ID for BCM43XG b43: Add NPHY kconfig option b43: Fix any N-PHY related WARN_ON() in the attach stage. zd1211rw: fix alignment for QOS and WDS frames Miguel Botón (3): ssb: add 'ssb_pcihost_set_power_state' function b44: power down PHY when interface down iwlwifi: fix compilation warning in 'iwl-4965.c' Zhu Yi (1): iwlwifi: fix typo in 'drivers/net/wireless/iwlwifi/Kconfig' drivers/net/b44.c | 28 +- drivers/net/wireless/adm8211.c|8 +- drivers/net/wireless/airo.c | 1233 - drivers/net/wireless/atmel.c | 30 +- drivers/net/wireless/b43/Kconfig | 58 +- drivers/net/wireless/b43/Makefile |9 +- drivers/net/wireless/b43/b43.h| 78 +- drivers/net/wireless/b43/debugfs.c|1 - drivers/net/wireless/b43/dma.c| 19 +- drivers/net/wireless/b43/dma.h| 50 - drivers/net/wireless/b43/main.c | 357 +++- drivers/net/wireless/b43/main.h |3 + drivers/net/wireless/b43/xmit.c | 26 +- drivers/net/wireless/b43legacy/main.c |5 - drivers/net/wireless/b43legacy/phy.c |2 +- drivers/net/wireless/bcm43xx/bcm43xx.h|6 +- drivers/net/wireless/bcm43xx/bcm43xx_main.c | 40 +-
Please pull 'upstream-jgarzik' branch of wireless-2.6
Jeff, More for 2.6.25...Mr. Woodhouse continues his savage assault on libertas, the b43legacy version of the rfkill led patch is here (b43legacy rfkill stuff is not in 2.6.24), and there are a couple of iwlwifi patches as well. Let me know if there are problems! Thanks, John --- Individual patches are available here: http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/upstream-jgarzik --- The following changes since commit b503d38b01bf313e4f1250c4ded89fc10a1d3da0: Ramkrishna Vepa (1): S2io: Fixes to enable multiple transmit fifos are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-jgarzik David Woodhouse (38): libertas: don't exit worker thread until kthread_stop() is called libertas: stop attempting to reset devices on unload libertas: clean up if_usb driver libertas: kill whitespace at end of lines libertas: kill unused wait_option field in struct cmd_ctrl_node libertas: rename and clean up DownloadcommandToStation libertas: don't use __lbs_cmd() with empty callback in if_usb.c libertas: remove some pointless checks for cmdnode buffer being present libertas: introduce and use lbs_complete_command() for command completion libertas: don't re-initialise cmdnode when taking it off the free queue libertas: kill cleanup_cmdnode() libertas: let __lbs_cmd() free its own cmdnode libertas: kill pdata_buf member of struct cmd_ctrl_node libertas: store command result in cmdnode instead of priv-cur_cmd_retcode libertas: add __lbs_cmd_async() for asynchronous command submission libertas: ensure response buffer size is always set for lbs_cmd_with_response libertas: handle command timeout in main thread instead of directly in timer libertas: kill 'addtail' argument to lbs_queue_cmd() and make it static libertas: fix return from lbs_update_channel() libertas: add SLEEP_PERIOD and FW_WAKE_METHOD command definitions libertas: fix buffer handling of PS_MODE commands and responses libertas: don't clear priv-dnld_sent after sending sleep confirm libertas: handle HOST_AWAKE event by sending WAKEUP_CONFIRM command libertas: allow for PS mode to be disabled when firmware doesn't support it libertas: Check for PS mode support on USB devices libertas: reduce explicit references to priv-cur_cmd-cmdbuf libertas: use priv-upld_buf for command responses libertas: discard DEFER responses to commands; let the timeout trigger libertas: make lbs_submit_command always 'succeed' and set command timer libertas: submit RSSI command on tx timeout, to check whether module is dead libertas: convert RADIO_CONTROL to a direct command libertas: convert INACTIVITY_TIMEOUT to a direct command libertas: convert SLEEP_PARAMS to a direct command libertas: convert SET_WEP to a direct command libertas: convert ENABLE_RSN to a direct command libertas: change inference about buffer size in lbs_cmd() libertas: convert SUBSCRIBE_EVENT to a direct command libertas: remove check for driver_lock in lbs_interrupt() Larry Finger (1): b43legacy: Fix rfkill radio LED Zhu Yi (2): iwlwifi: proper monitor support iwlwifi: skip mac80211 conf during a hardware scan and replay it afterwards drivers/net/wireless/b43legacy/leds.c |4 + drivers/net/wireless/b43legacy/main.c | 20 +- drivers/net/wireless/b43legacy/rfkill.c | 133 --- drivers/net/wireless/iwlwifi/iwl-3945.c | 120 +- drivers/net/wireless/iwlwifi/iwl-3945.h | 38 +-- drivers/net/wireless/iwlwifi/iwl-4965.c | 120 ++- drivers/net/wireless/iwlwifi/iwl-4965.h | 26 +-- drivers/net/wireless/iwlwifi/iwl3945-base.c | 139 +-- drivers/net/wireless/iwlwifi/iwl4965-base.c | 122 +-- drivers/net/wireless/libertas/assoc.c | 61 ++-- drivers/net/wireless/libertas/cmd.c | 565 +++ drivers/net/wireless/libertas/cmd.h | 29 ++- drivers/net/wireless/libertas/cmdresp.c | 162 +++- drivers/net/wireless/libertas/debugfs.c | 350 - drivers/net/wireless/libertas/decl.h|9 +- drivers/net/wireless/libertas/dev.h | 19 +- drivers/net/wireless/libertas/host.h|8 + drivers/net/wireless/libertas/hostcmd.h | 47 ++- drivers/net/wireless/libertas/if_cs.c | 10 +- drivers/net/wireless/libertas/if_sdio.c | 10 +- drivers/net/wireless/libertas/if_usb.c | 470 ++- drivers/net/wireless/libertas/if_usb.h | 95 ++--- drivers/net/wireless/libertas/main.c| 92 +++-- drivers/net/wireless/libertas/tx.c |4 +- drivers/net/wireless/libertas/wext.c|7 + 25 files changed, 1200 insertions(+), 1460 deletions(-) Omnibus
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
Please pull 'upstream-jgarzik' branch of wireless-2.6
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 Andrea Merello (1): rtl8187: fix tx power reading Andres Salomon (4): libertas: drop useless default_fw_name variable libertas: mark module_init/exit functions as __init/__exit libertas: reset devices upon disconnect rather than module unloading libertas: nuke useless variable usbdriver_name and useless comments Ben M Cahill (29): iwl3945: re-align 3945 event log data iwl4965: add comments to rate scaling code iwlwifi: add comments to EEPROM stuff iwl-4965-hw.h: clean up unused eeprom structures and definitions iwlwifi: clean up and clarify some comments after 3945/4965 split iwlwifi: Move is_legacy() macro family from iwl-4965-hw.h to iwl-4965-rs.h iwlwifi: Add comments to some driver data structures iwlwifi: Document 4965 rate_n_flags bits iwlwifi: Document Rx calibration iwlwifi: Partially clean-up, add comments to iwl-*-hw.h iwlwifi: clean up some unused definitions in iwl-4965.h and iwl-3945.h iwlwifi: add comments, mostly on Tx queues iwlwifi: add comments to iwl*-base.c iwlwifi: Clean up unused definitions in iwl-3945-hw.h iwlwifi: clean up unused definitions in iwl-4965-hw.h iwlwifi: move uCode API definitions to iwl-4965-commands.h iwlwifi: move HT_IE_EXT_CHANNEL_* driver definitions to iwl-4965.h iwlwifi: document temperature calculation iwlwifi: document txpower calculations iwlwifi: document keep-warm buffer iwlwifi: document Rx registers iwlwifi: document Tx registers iwlwifi: document shared Tx structures iwlwifi: document 4965 Tx scheduler iwlwifi: document command header and alive responses iwlwifi: add comments to RXON command and txpower formats iwlwifi: add comments to QOS and ADD_STA commands iwlwifi: add comments to Tx commands iwlwifi: document 4965 rate scaling Brajesh Dave (2): libertas: separate mesh connectivity from that of the main interface libertas: configurable beacon interval Christoph Hellwig (1): iwlwifi: cleanup namespace Daniel Drake (3): zd1211rw: port to mac80211 zd1211rw: Add ID for Trendnet TEW-429UB A zd1211rw: add copyright notices Frank Lichtenheld (2): b43: silence a bogus gcc warning b43legacy: properly fix a bogus gcc warning Holger Schurig (9): libertas: move to uniform lbs_/LBS_ namespace libertas: clean up association debug messages libertas: remove arbitrary typedefs libertas: rework event subscription libertas: tweak association debug output libertas: tweak tx path debugging libertas: remove numprobes libertas: remove user-specified channel list libertas: less eventcause shifts Ivo van Doorn (10): rt2x00: Move duplicate code into rt2x00pci_txdone() rt2x00: Replace DRV_NAME with KBUILD_MODNAME rt2x00: Extend PLCP descriptor definition for rt2400pci rt2x00: Move register value/offset files into new folder rt2x00: Add chipset version to chipset debugfs entry rt2x00: Add skb descriptor rt2x00: Add TX/RX frame dumping facility rt2x00: Use IEEE80211_IF_TYPE_INVALID directly rt2x00: Cleanup rfkill rt2x00: Release rt2x00 2.0.13 Johannes Berg (3): b43: include full 64-bit timestamp in monitor mode b43: include FCS in frames handed to mac80211 b43legacy: include full 64-bit timestamp in monitor mode John W. Linville (1): iwlwifi: remove redundant initialization of final_mode
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
Please pull 'upstream-jgarzik' branch of wireless-2.6
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/ --- The following changes since commit 5d66f151ac7cb5162f201fe2996c6e01f0323f37: Linus Torvalds (1): Merge master.kernel.org:/.../gregkh/pci-2.6 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-jgarzik Adam Baker (2): rt2x00: Unconstify rt2x00dev rt2x00: Place mutex around USB register access Christoph Hellwig (3): iwlwifi: mark more functions/variables static iwlwifi: keep 3945 and 4965 headers separate iwlwifi: cleanup Kconfig and ifdefs to split 3945 and 4965 Dan Williams (1): orinoco: more reliable scan handling Dmitry Torokhov (1): P54: use temporary variables to reduce size of generated code Emmanuel Grumbach (3): iwlwifi-ht: move 4965 SCD registers to iwl-prph.h iwlwifi: move 3945 SCD registers to iwl-prph.h iwlwifi: add 5965 SCD registers to iwl-prph.h Holger Schurig (1): libertas: move wlan_*_association_work from header to c file Ian Schram (5): iwlwifi: fix various spelling and typos iwlwifi: rename iwl_eeprom_aqcuire_semaphore to _acquire_ iwlwifi: Two comments in iwl-3945.c were longer than 80 columns iwlwifi: Beautify by removing superfluous newlines and code iwlwifi: remove late null-check and duplicate bug_on Ivo van Doorn (15): rt2x00: Move quality statistics into seperate structure rt2x00: Use enum defines rt2x00: Correctly translate mac80211 antenna setup to rt2x00 rt2x00: SW diversity should default to antenna B rt2x00: Remove rt2x00_clear_link rt2x00: Implement SW diversity rt2x00: Cleanup if-statements rt2x00: Release rt2x00 2.0.11 rt2x00: Disable RX when switching antenna rt2x00: Split rt61/rt73 antenna selection into RX and TX antenna rt2x00: Input-polldev requires input device rt2x00: Detect initial rfkill state on register rt2x00: Remove unused variables rt2x00: Remove data_desc structure rt2x00: Release rt2x00 2.0.12 Jes Sorensen (1): iwlwifi: disable interrupts before calling request_irq Larry Finger (4): b43legacy: LED triggers support b43legacy: RF-kill support b43legacy: Use input-polldev for the rfkill switch b43legacy: Rewrite pwork locking Matthias Kaehlcke (1): Prism54: Convert mgmt_sem to the mutex API Mattias Nissler (4): rt2x00: Fix antenna selection. rt2x00: Rework rt61 antenna selection. rt2x00: Rework rt73 antenna selection rt2x00: Correctly set ACK bit in tx descriptors Michael Buesch (7): b43legacy: Remove set_key callback b43: Dereference of wl-current_dev must be protected by wl-mutex b43: Use the retry limit parameters from mac80211 b43: consistent naming for ieee80211_ops b43: Fix rfkill callback deadlock b43: debugfs SHM read buffer overrun fix b43: Rewrite and fix rfkill init Roel Kluin (1): wireless: fix '!x y' typo's Tomas Winkler (11): iwlwifi: Add erp_ie_changed hanlder iwlwifi: renaming last_used and first_empty iwlwifi: rs-4965 fix return values iwlwifi: add TGN flag to qos parameters iwlwifi: remove cck_flag from iwl_driver_hw_info iwlwifi: remove cck_power_index_compensation iwlwifi: using PCI_DEVICE macro iwlwifi: replace restricted_reg with prph iwlwifi: rename restricted_mem to targ_mem iwlwifi: replacing wording restricted to nic access in iwl-io iwlwifi: Renames struct fw_image_desc to struct fw_desc Zhu Yi (2): iwlwifi: Update iwlwifi version stamp to 1.1.18 iwlwifi: Update iwlwifi version stamp to 1.1.19 mabbas (2): iwlwifi: accept up to 4K frame size on Rx side to fit A-MSDU frame iwl4965: exclude 60M rate from probe request drivers/net/wireless/Makefile |3 +- drivers/net/wireless/airo.c|2 +- drivers/net/wireless/atmel.c |2 +- drivers/net/wireless/b43/debugfs.c |2 +- drivers/net/wireless/b43/main.c| 159 ++-- drivers/net/wireless/b43/rfkill.c | 115 +-- drivers/net/wireless/b43/rfkill.h | 14 +- drivers/net/wireless/b43/xmit.c|3 +- drivers/net/wireless/b43legacy/Kconfig | 12 + drivers/net/wireless/b43legacy/Makefile| 29 +- drivers/net/wireless/b43legacy/b43legacy.h | 11 +- drivers/net/wireless/b43legacy/leds.c | 413 -
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
Please pull 'upstream-jgarzik' branch of wireless-2.6
Jeff,
A few more for 2.6.24...
Thanks,
John
---
The following changes since commit 18d256761aa268fd2fb113c4fd26c400431f1dc1:
Jeff Garzik (1):
Merge branch 'stats' 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
Jesper Juhl (1):
zd1211rw: Don't needlessly initialize variable to NULL in zd_chip
Larry Finger (1):
bcm43xx: Change radio hardware switch status printk from debug to regular
Ulrich Kunitz (1):
zd1211rw: add USB id for Telegent TG54USB WLAN adapter
drivers/net/wireless/bcm43xx/bcm43xx_main.c |4 ++--
drivers/net/wireless/zd1211rw/zd_chip.c |2 +-
drivers/net/wireless/zd1211rw/zd_usb.c |1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index 618d1a2..4d84631 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -2380,7 +2380,7 @@ static int bcm43xx_chip_init(struct bcm43xx_private *bcm)
goto err_gpio_cleanup;
bcm43xx_radio_turn_on(bcm);
bcm-radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
- dprintk(KERN_INFO PFX Radio %s by hardware\n,
+ printk(KERN_INFO PFX Radio %s by hardware\n,
(bcm-radio_hw_enable == 0) ? disabled : enabled);
bcm43xx_write16(bcm, 0x03E6, 0x);
@@ -3129,7 +3129,7 @@ static void bcm43xx_periodic_every1sec(struct
bcm43xx_private *bcm)
radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
if (unlikely(bcm-radio_hw_enable != radio_hw_enable)) {
bcm-radio_hw_enable = radio_hw_enable;
- dprintk(KERN_INFO PFX Radio hardware status changed to %s\n,
+ printk(KERN_INFO PFX Radio hardware status changed to %s\n,
(radio_hw_enable == 0) ? disabled : enabled);
bcm43xx_leds_update(bcm, 0);
}
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c
b/drivers/net/wireless/zd1211rw/zd_chip.c
index 4959042..06244d8 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -106,7 +106,7 @@ int zd_ioread32v_locked(struct zd_chip *chip, u32 *values,
const zd_addr_t *addr
{
int r;
int i;
- zd_addr_t *a16 = (zd_addr_t *)NULL;
+ zd_addr_t *a16;
u16 *v16;
unsigned int count16;
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c
b/drivers/net/wireless/zd1211rw/zd_usb.c
index e49628b..895ff84 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -55,6 +55,7 @@ static struct usb_device_id usb_ids[] = {
{ USB_DEVICE(0x14ea, 0xab13), .driver_info = DEVICE_ZD1211 },
{ USB_DEVICE(0x13b1, 0x001e), .driver_info = DEVICE_ZD1211 },
{ USB_DEVICE(0x0586, 0x3407), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x129b, 0x1666), .driver_info = DEVICE_ZD1211 },
/* ZD1211B */
{ USB_DEVICE(0x0ace, 0x1215), .driver_info = DEVICE_ZD1211B },
{ USB_DEVICE(0x157e, 0x300d), .driver_info = DEVICE_ZD1211B },
--
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, 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
Please pull 'upstream-jgarzik' branch of wireless-2.6
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(-)
diff --git a/drivers/net/wireless/libertas/cmd.c
b/drivers/net/wireless/libertas/cmd.c
index 98092b9..33dbed0 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1009,7 +1009,9 @@ static int DownloadcommandToStation(wlan_private * priv,
if (ret != 0) {
lbs_deb_host(DNLD_CMD: hw_host_to_card failed\n);
spin_lock_irqsave(adapter-driver_lock, flags);
+ adapter-cur_cmd_retcode = ret;
__libertas_cleanup_and_insert_cmd(priv, adapter-cur_cmd);
+ adapter-nr_cmd_pending--;
adapter-cur_cmd = NULL;
spin_unlock_irqrestore(adapter-driver_lock, flags);
goto done;
diff --git a/drivers/net/wireless/libertas/cmdresp.c
b/drivers/net/wireless/libertas/cmdresp.c
index 4c36e63..d64ad87 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -174,7 +174,11 @@ static int wlan_ret_get_hw_spec(wlan_private * priv,
lbs_deb_cmd(GET_HW_SPEC: hardware interface 0x%x, hardware spec
0x%04x\n,
hwspec-hwifversion, hwspec-version);
- adapter-regioncode = le16_to_cpu(hwspec-regioncode);
+ /* Clamp region code to 8-bit since FW spec indicates that it should
+* only ever be 8-bit, even though the field size is 16-bit. Some
firmware
+* returns non-zero high 8 bits here.
+*/
+ adapter-regioncode = le16_to_cpu(hwspec-regioncode) 0xFF;
for (i = 0; i MRVDRV_MAX_REGION_CODE; i++) {
/* use the region code to search for the index */
diff --git a/drivers/net/wireless/libertas/debugfs.c
b/drivers/net/wireless/libertas/debugfs.c
index 6d95148..816f42e 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -1838,7 +1838,7 @@ static ssize_t wlan_debugfs_write(struct file *f, const
char __user *buf,
char *p2;
struct debug_data *d = (struct debug_data *)f-private_data;
- pdata = (char *)kmalloc(cnt, GFP_KERNEL);
+ pdata = kmalloc(cnt, GFP_KERNEL);
if (pdata == NULL)
return 0;
diff --git a/drivers/net/wireless/libertas/decl.h
b/drivers/net/wireless/libertas/decl.h
index 095edf6..87fea9d 100644
--- a/drivers/net/wireless/libertas/decl.h
+++ b/drivers/net/wireless/libertas/decl.h
@@ -72,8 +72,9 @@ void libertas_send_iwevcustom_event(wlan_private * priv, s8 *
str);
struct chan_freq_power *libertas_get_region_cfp_table(u8 region, u8 band,
int *cfp_no);
wlan_private *libertas_add_card(void *card, struct device *dmdev);
-int libertas_activate_card(wlan_private *priv);
int libertas_remove_card(wlan_private *priv);
+int libertas_start_card(wlan_private *priv);
+int libertas_stop_card(wlan_private *priv);
int
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
Please pull 'upstream-jgarzik' branch of wireless-2.6
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(-)
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index c8b5c22..62b8669 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1841,7 +1841,6 @@ static int wl3501_get_encode(struct net_device *dev,
tocopy = min_t(u8, len_keys, wrqu-encoding.length);
tocopy = min_t(u8, tocopy, 100);
wrqu-encoding.length = tocopy;
- memset(extra, 0, tocopy);
memcpy(extra, keys, tocopy);
out:
return rc;
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c
b/drivers/net/wireless/zd1211rw/zd_chip.c
index c39f198..4959042 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -500,8 +500,6 @@ int zd_chip_lock_phy_regs(struct zd_chip *chip)
return r;
}
- dev_dbg_f(zd_chip_dev(chip),
- CR_REG1: 0x%02x - 0x%02x\n, tmp, tmp ~UNLOCK_PHY_REGS);
tmp = ~UNLOCK_PHY_REGS;
r = zd_iowrite32_locked(chip, tmp, CR_REG1);
@@ -523,8 +521,6 @@ int zd_chip_unlock_phy_regs(struct zd_chip *chip)
return r;
}
- dev_dbg_f(zd_chip_dev(chip),
- CR_REG1: 0x%02x - 0x%02x\n, tmp, tmp | UNLOCK_PHY_REGS);
tmp |= UNLOCK_PHY_REGS;
r = zd_iowrite32_locked(chip, tmp, CR_REG1);
@@ -841,8 +837,6 @@ static int get_aw_pt_bi(struct zd_chip *chip, struct
aw_pt_bi *s)
s-atim_wnd_period = values[0];
s-pre_tbtt = values[1];
s-beacon_interval = values[2];
- dev_dbg_f(zd_chip_dev(chip), aw %u pt %u bi %u\n,
- s-atim_wnd_period, s-pre_tbtt, s-beacon_interval);
return 0;
}
@@ -864,9 +858,6 @@ static int set_aw_pt_bi(struct zd_chip *chip, struct
aw_pt_bi *s)
reqs[2].addr = CR_BCN_INTERVAL;
reqs[2].value = s-beacon_interval;
- dev_dbg_f(zd_chip_dev(chip),
- aw %u pt %u bi %u\n, s-atim_wnd_period, s-pre_tbtt,
- s-beacon_interval);
return zd_iowrite32a_locked(chip, reqs, ARRAY_SIZE(reqs));
}
@@ -1018,19 +1009,19 @@ int zd_chip_set_rts_cts_rate_locked(struct zd_chip
*chip,
u32 value = 0;
/* Modulation bit */
- if (ZD_CS_TYPE(rts_rate) == ZD_CS_OFDM)
+ if (ZD_MODULATION_TYPE(rts_rate) == ZD_OFDM)
rts_mod = ZD_RX_OFDM;
dev_dbg_f(zd_chip_dev(chip), rts_rate=%x preamble=%x\n,
rts_rate, preamble);
- value |= rts_rate RTSCTS_SH_RTS_RATE;
+ value |= ZD_PURE_RATE(rts_rate) RTSCTS_SH_RTS_RATE;
value |= rts_mod RTSCTS_SH_RTS_MOD_TYPE;
value |= preamble RTSCTS_SH_RTS_PMB_TYPE;
value |= preamble RTSCTS_SH_CTS_PMB_TYPE;
/* We always send 11M self-CTS messages, like the vendor driver. */
- value |= ZD_CCK_RATE_11M RTSCTS_SH_CTS_RATE;
+ value |= ZD_PURE_RATE(ZD_CCK_RATE_11M) RTSCTS_SH_CTS_RATE;
value |= ZD_RX_CCK RTSCTS_SH_CTS_MOD_TYPE;
return zd_iowrite32_locked(chip, value, CR_RTS_CTS_RATE);
@@ -1160,16 +1151,12 @@ out:
static int update_pwr_int(struct zd_chip *chip, u8 channel)
{
u8 value = chip-pwr_int_values[channel - 1];
- dev_dbg_f(zd_chip_dev(chip), channel %d pwr_int %#04x\n,
-channel, value);
return zd_iowrite16_locked(chip, value, CR31);
}
static int update_pwr_cal(struct zd_chip *chip, u8 channel)
{
u8 value = chip-pwr_cal_values[channel-1];
- dev_dbg_f(zd_chip_dev(chip), channel %d pwr_cal %#04x\n,
-channel, value);
return zd_iowrite16_locked(chip, value, CR68);
}
@@ -1184,9 +1171,6 @@ static int update_ofdm_cal(struct zd_chip *chip, u8
channel)
ioreqs[2].addr = CR65;
ioreqs[2].value =
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
Please pull 'upstream-jgarzik' branch of wireless-2.6
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(-) diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index ae27af0..80667b1 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -63,11 +63,6 @@ config WAVELAN a Radio LAN (wireless Ethernet-like Local Area Network) using the radio frequencies 900 MHz and 2.4 GHz. - This driver support the ISA version of the WaveLAN card. A separate - driver for the PCMCIA (PC-card) hardware is available in David - Hinds' pcmcia-cs package (see the file file:Documentation/Changes - for location). - If you want to use an ISA WaveLAN card under Linux, say Y and read the Ethernet-HOWTO, available from http://www.tldp.org/docs.html#howto. Some more specific @@ -379,30 +374,6 @@ config PCI_HERMES common. Some of the built-in wireless adaptors in laptops are of this variety. -config ATMEL - tristate Atmel at76c50x chipset 802.11b support - depends on (PCI || PCMCIA) WLAN_80211 - select WIRELESS_EXT - select FW_LOADER - select CRC32 - ---help--- -A driver 802.11b wireless cards based on the Atmel fast-vnet -chips. This driver supports standard Linux wireless extensions. - -Many cards based on this chipset do not have flash memory -and need their firmware loaded at start-up. If yours is -one of these, you will need to provide a firmware image -to be loaded into the card by the driver. The Atmel -firmware package can be downloaded from -http://www.thekelleys.org.uk/atmel - -config PCI_ATMEL - tristate Atmel at76c506 PCI cards - depends on ATMEL PCI - ---help--- -Enable support for PCI and mini-PCI cards containing the -Atmel at76c506 chip. - config PCMCIA_HERMES tristate Hermes PCMCIA card support depends on PCMCIA HERMES @@ -414,12 +385,7 @@ config PCMCIA_HERMES such as the Linksys, D-Link and Farallon Skyline. It should also work on Symbol cards such as the 3Com AirConnect and Ericsson WLAN. - To use your PC-cards, you will need supporting software from David - Hinds' pcmcia-cs package (see the file file:Documentation/Changes - for location). You also want to check out the PCMCIA-HOWTO, - available from http://www.tldp.org/docs.html#howto. - - You will also very likely also need the Wireless Tools in order to + You will very likely need the Wireless Tools in order to configure your card and that /etc/pcmcia/wireless.opts works: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html. @@ -437,6 +403,40 @@ config PCMCIA_SPECTRUM for downloading Symbol firmware are available at http://sourceforge.net/projects/orinoco/ +config ATMEL + tristate Atmel at76c50x chipset 802.11b support + depends on (PCI || PCMCIA) WLAN_80211 + select WIRELESS_EXT + select FW_LOADER + select CRC32 + ---help--- +A driver 802.11b wireless cards based on the Atmel fast-vnet +chips. This driver supports standard Linux wireless
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
Please pull 'upstream-jgarzik' branch of wireless-2.6
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(-)
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 072ede7..8990585 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -7868,10 +7868,10 @@ static int ipw2100_wx_set_powermode(struct net_device
*dev,
goto done;
}
- if ((mode 1) || (mode POWER_MODES))
+ if ((mode 0) || (mode POWER_MODES))
mode = IPW_POWER_AUTO;
- if (priv-power_mode != mode)
+ if (IPW_POWER_LEVEL(priv-power_mode) != mode)
err = ipw2100_set_power_mode(priv, mode);
done:
mutex_unlock(priv-action_mutex);
@@ -7902,7 +7902,7 @@ static int ipw2100_wx_get_powermode(struct net_device
*dev,
break;
case IPW_POWER_AUTO:
snprintf(extra, MAX_POWER_STRING,
-Power save level: %d (Auto), 0);
+Power save level: %d (Auto), level);
break;
default:
timeout = timeout_duration[level - 1] / 1000;
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index aa32a97..61497c4 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -70,7 +70,7 @@
#define VQ
#endif
-#define IPW2200_VERSION 1.2.0 VK VD VM VP VR VQ
+#define IPW2200_VERSION 1.2.2 VK VD VM VP VR VQ
#define DRV_DESCRIPTIONIntel(R) PRO/Wireless 2200/2915 Network Driver
#define DRV_COPYRIGHT Copyright(c) 2003-2006 Intel Corporation
#define DRV_VERSION IPW2200_VERSION
@@ -2506,7 +2506,7 @@ static int ipw_send_power_mode(struct ipw_priv *priv, u32
mode)
break;
}
- param = cpu_to_le32(mode);
+ param = cpu_to_le32(param);
return ipw_send_cmd_pdu(priv, IPW_CMD_POWER_MODE, sizeof(param),
param);
}
@@ -9568,6 +9568,7 @@ static int ipw_wx_set_power(struct net_device *dev,
priv-power_mode = IPW_POWER_ENABLED | IPW_POWER_BATTERY;
else
priv-power_mode = IPW_POWER_ENABLED | priv-power_mode;
+
err = ipw_send_power_mode(priv, IPW_POWER_LEVEL(priv-power_mode));
if (err) {
IPW_DEBUG_WX(failed setting power mode.\n);
@@ -9604,22 +9605,19 @@ static int ipw_wx_set_powermode(struct net_device *dev,
struct ipw_priv *priv = ieee80211_priv(dev);
int mode = *(int *)extra;
int err;
+
mutex_lock(priv-mutex);
- if ((mode 1) || (mode IPW_POWER_LIMIT)) {
+ if ((mode 1) || (mode IPW_POWER_LIMIT))
mode = IPW_POWER_AC;
- priv-power_mode = mode;
- } else {
- priv-power_mode = IPW_POWER_ENABLED | mode;
- }
- if (priv-power_mode != mode) {
+ if (IPW_POWER_LEVEL(priv-power_mode) != mode) {
err = ipw_send_power_mode(priv, mode);
-
if (err) {
IPW_DEBUG_WX(failed setting power mode.\n);
mutex_unlock(priv-mutex);
return err;
}
+ priv-power_mode = IPW_POWER_ENABLED | mode;
}
mutex_unlock(priv-mutex);
return 0;
@@ -10555,7 +10553,7 @@ static irqreturn_t ipw_isr(int irq, void *data)
spin_lock(priv-irq_lock);
if (!(priv-status STATUS_INT_ENABLED)) {
- /* Shared IRQ */
+ /* IRQ is disabled */
goto none;
}
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c
b/drivers/net/wireless/zd1211rw/zd_usb.c
index 28d41a2..a9c339e 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -72,6 +72,8 @@ static struct usb_device_id usb_ids[] = {
{ USB_DEVICE(0x0586, 0x3413), .driver_info = DEVICE_ZD1211B },
{ USB_DEVICE(0x0053, 0x5301), .driver_info =
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
Please pull 'upstream-jgarzik' branch of wireless-2.6
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
drivers/net/wireless/airo.c| 208
drivers/net/wireless/ipw2100.c | 11 +-
drivers/net/wireless/ipw2200.c |5 +-
drivers/net/wireless/libertas/cmd.c|2 +-
drivers/net/wireless/libertas/rx.c |1 -
drivers/net/wireless/libertas/version.h|1 -
drivers/net/wireless/libertas/wext.c |3 -
drivers/net/wireless/prism54/isl_ioctl.c | 22 +--
drivers/net/wireless/rtl8187_rtl8225.c |4 +-
drivers/net/wireless/zd1211rw/zd_chip.c| 88 ++-
drivers/net/wireless/zd1211rw/zd_chip.h| 13 +-
drivers/net/wireless/zd1211rw/zd_mac.c | 59 +---
drivers/net/wireless/zd1211rw/zd_mac.h |3 +-
drivers/net/wireless/zd1211rw/zd_rf.c |3 +-
drivers/net/wireless/zd1211rw/zd_rf.h |2 +-
drivers/net/wireless/zd1211rw/zd_rf_al2230.c | 12 +-
drivers/net/wireless/zd1211rw/zd_rf_al7230b.c |2 +-
drivers/net/wireless/zd1211rw/zd_rf_rf2959.c |2 +-
drivers/net/wireless/zd1211rw/zd_rf_uw2453.c |2 +-
drivers/net/wireless/zd1211rw/zd_usb.c | 98 ---
drivers/net/wireless/zd1211rw/zd_usb.h |3 +
net/ieee80211/softmac/ieee80211softmac_assoc.c |5 +-
22 files changed, 280 insertions(+), 269 deletions(-)
delete mode 100644 drivers/net/wireless/libertas/version.h
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 2d3a180..1c54908 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -52,6 +52,8 @@
#include airo.h
+#define DRV_NAME airo
+
#ifdef CONFIG_PCI
static struct pci_device_id card_ids[] = {
{ 0x14b9, 1, PCI_ANY_ID, PCI_ANY_ID, },
@@ -71,7 +73,7 @@ static int airo_pci_suspend(struct pci_dev *pdev,
pm_message_t state);
static int airo_pci_resume(struct pci_dev *pdev);
static struct pci_driver airo_driver = {
- .name = airo,
+ .name = DRV_NAME,
.id_table = card_ids,
.probe= airo_pci_probe,
.remove = __devexit_p(airo_pci_remove),
@@ -1092,7 +1094,7 @@ static int get_dec_u16( char *buffer, int *start, int
limit );
static void OUT4500( struct airo_info *, u16 register, u16 value );
static unsigned short IN4500( struct airo_info *, u16 register );
static u16 setup_card(struct airo_info*, u8 *mac, int lock);
-static int enable_MAC( struct airo_info *ai, Resp *rsp, int lock );
+static int enable_MAC(struct airo_info *ai, int lock);
static void disable_MAC(struct airo_info *ai, int lock);
static void enable_interrupts(struct airo_info*);
static void disable_interrupts(struct airo_info*);
@@ -1250,7 +1252,7 @@ static int flashputbuf(struct airo_info *ai);
static int flashrestart(struct airo_info *ai,struct net_device *dev);
#define airo_print(type, name, fmt, args...) \
- { printk(type airo(%s): fmt \n, name, ##args); }
+ printk(type DRV_NAME (%s): fmt \n, name, ##args)
#define airo_print_info(name, fmt, args...) \
airo_print(KERN_INFO, name, fmt, ##args)
@@ -1926,28 +1928,54 @@ static int readStatsRid(struct airo_info*ai, StatsRid
*sr, int rid, int lock) {
return rc;
}
+static void try_auto_wep(struct airo_info *ai)
+{
+ if (auto_wep !(ai-flags FLAG_RADIO_DOWN)) {
+ ai-expires = RUN_AT(3*HZ);
+ wake_up_interruptible(ai-thr_wait);
+ }
+}
+
static int airo_open(struct net_device *dev) {
- struct airo_info *info
