=============================================== ChangeLog for compat-wireless for linux-3.1 =============================================== This is the ChangeLog for the Linux kernel project compat-wireless. It provides a backport of a few Linux kernel subsystems down to older kernels: * 802.11 * Bluetooth * Ethernet For more details refer to the home page: http://wireless.kernel.org/en/users/Download/stable/ The compat-wireless project consists of code from three projects: * The Linux kernel: linux-2.6-allstable.git * Compat-wirelesS: compat-wireless.git * Compat: compat.git The compat-wireless stable releases incorporates code from from each of these git trees for the respective upstream Linux kernel stable release. A branch called linux-3.x.y exists for each stable release. Below we provide the ChangeLog of changes from the previous branched release to the new branched release. Release: linux-3.1 Updates from the compat.git project: ==================================== git shortlog linux-3.0.y..linux-3.1.y Eliad Peller (1): compat: define create_freezable_workqueue Hauke Mehrtens (14): compat: add support for kernel 3.0 compat: add device name in register_netdevice(dev) compat: rename CONFIG_COMPAT_KERNEL_ compat: add KEY_WPS_BUTTON compat: add bcma compat: replace genl_dump_check_consistent compat: backport ETH_P_LINK_CTL compat: backport generic pr_fmt compat: add include/crypto/aes.h compat: add skb_walk_frags() and skb_has_frag_list() compat: add IFF_TX_SKB_SHARING compat: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3 compat: add linux/export.h compat: add linux/atmoic.h Pavel Roskin (2): Signed-off-by: Pavel Roskin Signed-off-by: Pavel Roskin Stanislaw Gruszka (2): compat: add pr__once macros compat: add alloc_netdev_mqs Updates from the compat-wireless.git project: ============================================= git shortlog linux-2.6.0.y..linux-3.1.y Hauke Mehrtens (26): comapt-wireless: move doku to the correct place in config.mk compat-wireless: rename CONFIG_COMPAT_KERNEL_ compat-wireless: add support for kernel 3.XX compat-wireless: make patches apply again compat-wireless: add missing header compat-wireless: activate CARL9170_WPC by default compat-wireless: activate CONFIG_RT2800{USB,PCI}_RT35XX by default. compat-wireless: sync atheros-debug.mk with config.mk compat-wireless: update enable-older-kernels patches compat-wireless: add missing bluetooth header compat-wireless: add bcma compat-wireless: make patches apply again compat-wireless: add CONFIG_B43_SSB and other b43 options. compat-wireless: add some debug options. compat-wireless: do not set netlink seq. compat-wireless: add rtl8192de compat-wireless: add some new config options for b43 compat-wireless: deactivate sido suspend for brcmfmac on older kernels. compat-wireless: make patches apply again compat-wireless: fix build of b43 on older kernels. compat-wireless: adapt some changes to atheros ethernet driver compat-wireless: copy include/crypto/aes.h now compat-wireless: activate bcma support in b43 compat-wireless: make patches apply again compat-wireless: remove include of compat-2.6.h in cfg80211.h compat-wireless: add cfg80211-wext.h Luis R. Rodriguez (15): compat-wireless: fix patch 29-sdio_no_suspend.patch compat-wireless: refresh patches for next-20110614 compat-wireless: fix script for generating releases compat-wireless: refresh patches compat-wireless: fix 11-dev-pm-ops.patch for intel drivers compat-wireless: refresh patches for next-20110628 compat-wireless: refresh patches compat-wireless: fix netdev patch so it can be applied compat-wireless: refresh patches compat-wireless: refresh patches Revert "compat-wireless: add cfg80211-wext.h" compat-wireless: refresh patches for 3.1-rc1 compat-wireless: fix bluetooth patch compat-wireless: refresh patches compat-wireless: refresh patches for v3.1.1 Updates from the Linux kernel: ============================================= We only include very specific changes for the supported subsystems: * 802.11 * Bluetooth * Ethernet Generated by using: git log v3.0..HEAD \ net/wireless/ \ net/mac80211/ \ net/rfkill/ \ drivers/net/wireless/ \ net/bluetooth/ \ drivers/bluetooth/ \ drivers/net/atl1c/ \ drivers/net/atl1e/ \ drivers/net/atlx/ \ include/linux/nl80211.h \ include/linux/rfkill.h \ include/net/cfg80211.h \ include/net/regulatory.h \ include/net/cfg80211.h >> ChangeLog-3.1-wireless git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-allstable.git commit e0171f6d9a9c9a2e398fb40345ffbe0b3181057f Author: Rajkumar Manoharan Date: Thu Oct 20 14:22:43 2011 +0530 ath9k_hw: Fix regression of register offset for AR9003 chips commit 52d6d4ef5e6d1517688e27c11c01ab303ec681dd upstream. My recent commits (3782c69d, 324c74a) introduced regression for register offset selection that based on the macversion. Not using parentheses in proper manner for ternary operator leads to select wrong offset for the registers. This issue was observed with AR9462 chip that immediate disconnect after the association with the following message ieee80211 phy3: wlan0: Failed to send nullfunc to AP 00:23:69:12:ea:47 after 500ms, disconnecting. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit ed89d010e4d505f4dc1afa77c45d65f1980e46da Author: Johannes Berg Date: Fri Oct 28 11:59:47 2011 +0200 mac80211: disable powersave for broken APs commit 05cb91085760ca378f28fc274fbf77fc4fd9886c upstream. Only AID values 1-2007 are valid, but some APs have been found to send random bogus values, in the reported case an AP that was sending the AID field value 0xffff, an AID of 0x3fff (16383). There isn't much we can do but disable powersave since there's no way it can work properly in this case. Reported-by: Bill C Riemers Signed-off-by: Johannes Berg Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit a7870d687773d35a18bc5af7fc7a81963fe2fa02 Author: Eliad Peller Date: Thu Oct 20 19:05:50 2011 +0200 mac80211: config hw when going back on-channel commit 6911bf0453e0d6ea8eb694a4ce67a68d071c538e upstream. When going back on-channel, we should reconfigure the hw iff the hardware is not already configured to the operational channel. Signed-off-by: Eliad Peller Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 0ecc0ae0b8a9d86cd1adc68506c5d4bd77d740cc Author: Eliad Peller Date: Thu Oct 20 19:05:49 2011 +0200 mac80211: fix remain_off_channel regression commit eaa7af2ae582c9a8c51b374c48d5970b748a5ce2 upstream. The offchannel code is currently broken - we should remain_off_channel if the work was started, and the work's channel and channel_type are the same as local->tmp_channel and local->tmp_channel_type. However, if wk->chan_type and local->tmp_channel_type coexist (e.g. have the same channel type), we won't remain_off_channel. This behavior was introduced by commit da2fd1f ("mac80211: Allow work items to use existing channel type.") Tested-by: Ben Greear Signed-off-by: Eliad Peller Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit ab4ff307d18f5aa924c31e8b99bec3d8c560464e Author: Rajkumar Manoharan Date: Mon Oct 24 18:13:40 2011 +0530 ath9k_hw: Update AR9485 initvals to fix system hang issue commit 98fb2cc115b4ef1ea0a2d87a170c183bd395dd6c upstream. This patch fixes system hang when resuming from S3 state and lower rate sens failure issue. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 9ae9f13480be10697214ed82f4a0f32681309822 Author: Johannes Berg Date: Thu Sep 15 11:46:52 2011 -0700 iwlagn: do not use interruptible waits commit effd4d9aece9184f526e6556786a94d335e38b71 upstream. Since the dawn of its time, iwlwifi has used interruptible waits to wait for synchronous commands and firmware loading. This leads to "interesting" bugs, because it can't actually handle the interruptions; for example when a command sending is interrupted it will assume the command completed fully, and then leave it pending, which leads to all kinds of trouble when the command finishes later. Since there's no easy way to gracefully deal with interruptions, fix the driver to not use interruptible waits. This at least fixes the error iwlagn 0000:02:00.0: Error: Response NULL in 'REPLY_SCAN_ABORT_CMD' I have seen in P2P testing, but it is likely that there are other errors caused by this. Cc: Stanislaw Gruszka Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 986666ccf6868d11606dc28973979806d5525af9 Author: Stanislaw Gruszka Date: Wed Oct 12 10:16:35 2011 +0200 iwlagn: fix priv->cfg->ht_params NULL pointer dereference commit 107ef97a170dec95893f34614edd92eb8cb9b5d0 upstream. This fix regression introduced by commit: commit 15b3f3b006b42a678523cad989bfd60b76bf4403 Author: Wey-Yi Guy Date: Fri Jun 3 07:54:13 2011 -0700 iwlagn: set smps mode after assoc for 1000 device Also remove unneeded brackets on the way. Address: https://bugzilla.redhat.com/show_bug.cgi?id=744155 Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 212b9506b3f6b27cd0c3a2eed9ba1a3aa8d674d7 Author: Luciano Coelho Date: Thu Sep 22 10:06:10 2011 +0300 wl12xx: fix forced passive scans commit 6cd9d21a0c1e2648c07c32c66bb25795ad3208aa upstream. We were using incorrect max and min dwell times during forced passive scans because we were still using the active scan states to scan (passively) the channels that were not marked as passive. Instead of doing passive scans in active states, we now skip active states and scan for all channels in passive states. Signed-off-by: Luciano Coelho Signed-off-by: Greg Kroah-Hartman commit f9aea842ccd9be4c49e90c848afd187dd9880638 Author: Johannes Berg Date: Tue Oct 4 18:27:10 2011 +0200 mac80211: fix offchannel TX cookie matching commit 28a1bcdb57d50f3038a255741ecc83e391e5282e upstream. When I introduced in-kernel off-channel TX I introduced a bug -- the work can't be canceled again because the code clear the skb pointer. Fix this by keeping track separately of whether TX status has already been reported. Reported-by: Jouni Malinen Tested-by: Jouni Malinen Signed-off-by: Johannes Berg Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 7ea775ce8a1325ca58245523eddd8709d73993a0 Author: Felix Fietkau Date: Sat Oct 8 15:49:57 2011 +0200 ath9k: disable unnecessary PHY error reporting commit ac06697c79bad09e44a8b1d52104014016fb90de upstream. PHY errors relevant for ANI are always tracked by hardware counters, the bits that allow them to pass through the rx filter are independent of that. Enabling PHY errors in the rx filter often creates lots of useless DMA traffic and might be responsible for some of the rx dma stop failure warnings. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit cfd45841b2cd3e91e57b613b32419dddecf9cdc7 Author: Mohammed Shafi Shajakhan Date: Fri Sep 30 11:31:27 2011 +0530 ath9k_hw: Fix number of GPIO pins for AR9287/9300 commit 6321eb0977b011ac61dfca36e7c69b2c4325b104 upstream. this patch fixes the assumption of maximum number of GPIO pins present in AR9287/AR9300. this fix is essential as we might encounter some functionality issues involved in accessing the status of GPIO pins which are all incorrectly assumed to be not within the range of max_num_gpio of AR9300/AR9287 chipsets Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit b6fef1a36bb9e662e6f02e46f44d5085184f18b5 Author: Luis R. Rodriguez Date: Thu Sep 29 10:42:19 2011 -0700 ath9k_htc: add AVM FRITZ!WLAN 11N v2 support commit 8c34559b4a6df32e4af1b073397fa4dc189a5485 upstream. This was reported and tested by Martin Walter over at AVM GmbH Berlin. This also applies to 3.0.1 so sendint to stable. Cc: s.kirste@avm.de Cc: d.friedel@avm.de Cc: Martin Walter Cc: Peter Grabienski Tested-by: Martin Walter Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 41a5bf6108079254a3f2aa82ab192ce641ebfbfd Author: Rajkumar Manoharan Date: Thu Sep 15 19:02:25 2011 +0530 ath9k_hw: Fix magnitude/phase coeff correction commit e9c10469cf3c71bc1c6b0f01319161e277d6ac9b upstream. Do the magnitude/phase coeff correction only if the outlier is detected. Updating wrong magnitude/phase coeff factor impacts not only tx gain setting but also leads to poor performance in congested networks. In the clear environment the impact is very minimal because the outlier happens very rarely according to the past experiment. It occured less than once every 1000 calibrations. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 9b463e944a682cf1cad8483172325c2864deeeba Author: Rajkumar Manoharan Date: Sat Aug 20 17:22:09 2011 +0530 ath9k_hw: Fix descriptor status of TxOpExceeded commit 2a15b394f8e46dd3e2ab365ab41cfa701d92fa77 upstream. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 6230c9b4f8957c8938ee4cf2d03166d3c2dc89de Author: Paul Moore Date: Fri Oct 7 09:40:59 2011 +0000 bluetooth: Properly clone LSM attributes to newly created child connections The Bluetooth stack has internal connection handlers for all of the various Bluetooth protocols, and unfortunately, they are currently lacking the LSM hooks found in the core network stack's connection handlers. I say unfortunately, because this can cause problems for users who have have an LSM enabled and are using certain Bluetooth devices. See one problem report below: * http://bugzilla.redhat.com/show_bug.cgi?id=741703 In order to keep things simple at this point in time, this patch fixes the problem by cloning the parent socket's LSM attributes to the newly created child socket. If we decide we need a more elaborate LSM marking mechanism for Bluetooth (I somewhat doubt this) we can always revisit this decision in the future. Reported-by: James M. Cape Signed-off-by: Paul Moore Acked-by: James Morris Signed-off-by: David S. Miller commit a8acfd82ebefbb32f12f413019e53f9e939cf44e Merge: d93dc5c ba54238 Author: John W. Linville Date: Tue Sep 27 15:47:33 2011 -0400 Merge branch 'master' of git://git.infradead.org/users/linville/wireless into for-davem commit ba54238552625aad2d75f455a4d3db18ea7dec68 Author: Mohammed Shafi Shajakhan Date: Fri Sep 23 14:33:14 2011 +0530 ath9k: Fix a dma warning/memory leak proper dma_unmapping and freeing of skb's has to be done in the rx cleanup for EDMA chipsets when the device is unloaded and this also seems to address the following warning which shows up occasionally when the device is unloaded Call Trace: [] warn_slowpath_common+0x72/0xa0 [] ? dma_debug_device_change+0x19c/0x200 [] ? dma_debug_device_change+0x19c/0x200 [] warn_slowpath_fmt+0x33/0x40 [] dma_debug_device_change+0x19c/0x200 [] notifier_call_chain+0x82/0xb0 [] __blocking_notifier_call_chain+0x60/0x90 [] blocking_notifier_call_chain+0x1f/0x30 [] __device_release_driver+0xa4/0xc0 [] driver_detach+0x97/0xa0 [] bus_remove_driver+0x6c/0xe0 [] ? sysfs_addrm_finish+0x4b/0x60 [] driver_unregister+0x49/0x80 [] ? sysfs_remove_file+0x14/0x20 [] pci_unregister_driver+0x32/0x80 [] ath_pci_exit+0x12/0x20 [ath9k] [] ath9k_exit+0x17/0x36 [ath9k] [] ? mutex_unlock+0xd/0x10 [] sys_delete_module+0x13f/0x200 [] ? sys_munmap+0x4b/0x60 [] ? restore_all+0xf/0xf [] ? spurious_fault+0xe0/0xe0 [] ? trace_hardirqs_on_caller+0xf4/0x180 [] sysenter_do_call+0x12/0x38 ---[ end trace 16e1c1521c06bcf9 ]--- Mapped at: [] debug_dma_map_page+0x48/0x120 [] ath_rx_init+0x3f8/0x4b0 [ath9k] [] ath9k_init_device+0x4c4/0x7b0 [ath9k] [] ath_pci_probe+0x263/0x330 [ath9k] Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 831d85471e761e190c3c8979b37540d699ae5812 Author: Larry Finger Date: Thu Sep 22 22:59:02 2011 -0500 rtlwifi: rtl8192cu: Fix unitialized struct Driver rtl8192cu assigns a new struct rtl_tcb_desc object, but fails to clear it. Signed-off-by: Larry Finger Cc: Stable [2.6.39+] Signed-off-by: John W. Linville commit 6c80c39d9a6986a566c30d797aae37bfb697eea3 Author: Johannes Berg Date: Thu Sep 22 14:59:04 2011 -0700 iwlagn: fix dangling scan request If iwl_scan_initiate() fails for any reason, priv->scan_request and priv->scan_vif are left dangling. This can lead to a crash later when iwl_bg_scan_completed() tries to run a pending scan request. In practice, this seems to be very rare due to the STATUS_SCANNING check earlier. That check, however, is wrong -- it should allow a scan to be queued when a reset/roc scan is going on. When a normal scan is already going on, a new one can't be issued by mac80211, so that code can be removed completely. I introduced this bug when adding off-channel support in commit 266af4c745952e9bebf687dd68af58df553cb59d. Cc: stable@kernel.org [3.0] Reported-by: Peng Yan Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 1b9ca0272ffae212e726380f66777b30a56ed7a5 Author: Jouni Malinen Date: Wed Sep 21 16:13:07 2011 +0300 cfg80211: Fix validation of AKM suites Incorrect variable was used in validating the akm_suites array from NL80211_ATTR_AKM_SUITES. In addition, there was no explicit validation of the array length (we only have room for NL80211_MAX_NR_AKM_SUITES). This can result in a buffer write overflow for stack variables with arbitrary data from user space. The nl80211 commands using the affected functionality require GENL_ADMIN_PERM, so this is only exposed to admin users. Cc: stable@kernel.org Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 65d0f19e583e80e42b1c67c166bfc4dfdf6ab693 Author: Stanislaw Gruszka Date: Tue Sep 20 16:49:03 2011 +0200 iwlegacy: do not use interruptible waits iwlegacy version of fix: commit effd4d9aece9184f526e6556786a94d335e38b71 Author: Johannes Berg Date: Thu Sep 15 11:46:52 2011 -0700 iwlagn: do not use interruptible waits Since the dawn of its time, iwlwifi has used interruptible waits to wait for synchronous commands and firmware loading. This leads to "interesting" bugs, because it can't actually handle the interruptions; for example when a command sending is interrupted it will assume the command completed fully, and then leave it pending, which leads to all kinds of trouble when the command finishes later. Since there's no easy way to gracefully deal with interruptions, fix the driver to not use interruptible waits. This at least fixes the error iwlagn 0000:02:00.0: Error: Response NULL in 'REPLY_SCAN_ABORT_CMD' I have seen in P2P testing, but it is likely that there are other errors caused by this. Cc: stable@kernel.org # 2.6.39+ Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit 2e2a41d6ca07d1b2aa67015c35fd80701c98e867 Author: Stanislaw Gruszka Date: Tue Sep 20 16:46:36 2011 +0200 iwlegacy: fix command queue timeout iwlegacy version of fix: commit 282cdb325aea4ebbc42ce753b47cc96145eb54bc Author: Johannes Berg Date: Mon Sep 12 12:09:10 2011 -0700 iwlagn: fix command queue timeout If the command queue is constantly busy, which can happen in P2P, the hangcheck timer will frequently find a command in it and will eventually reset the device because nothing sets the timestamp for this queue when commands are processed. Fix this by setting the timestamp when a command completes. iwlegacy does not support P2P, but this patch fix possible unneeded hardware resets, hence is needed. Cc: stable@kernel.org # 2.6.39+ Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit e9f9530bb697f53dd620df290102359a3325bb23 Author: Rajkumar Manoharan Date: Tue Sep 20 16:23:51 2011 +0530 ath9k_hw: Fix Rx DMA stuck for AR9003 chips During the endurance testing, rx frames are not getting DMAd from MAC whereas pcu rx frame counters are getting updated properly. As per systems team input updated the initval to fix rx dma stuck issue. Cc: stable@kernel.org Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit eebb6fb4ae2f60a82e38afb6d8b373a4216bf891 Merge: 9d037a7 8c23516 Author: John W. Linville Date: Tue Sep 20 09:19:14 2011 -0400 Merge branch 'master' of ssh://infradead/~/public_git/wireless into for-davem commit 8c23516fbb209ccf8f8c36268311c721faff29ee Author: Manual Munz Date: Sun Sep 18 18:24:03 2011 -0500 b43: Fix beacon problem in ad-hoc mode In ad-hoc mode, driver b43 does not issue beacons. Signed-off-by: Manual Munz Tested-by: Larry Finger Signed-off-by: Larry Finger Cc: Stable Signed-off-by: John W. Linville commit 5d59bbce3d5fba0c612e830f919e003d3da90d70 Merge: 2249b01 f78b682 Author: John W. Linville Date: Mon Sep 19 14:47:29 2011 -0400 Merge branch 'for-3.1' of git://github.com/padovan/bluetooth-next commit b0e7031ac08fa0aa242531c8d9a0cf9ae8ee276d Merge: 01a7143 8e2ec63 Author: Linus Torvalds Date: Sun Sep 18 11:02:26 2011 -0700 Merge git://github.com/davem330/net * git://github.com/davem330/net: (62 commits) ipv6: don't use inetpeer to store metrics for routes. can: ti_hecc: include linux/io.h IRDA: Fix global type conflicts in net/irda/irsysctl.c v2 net: Handle different key sizes between address families in flow cache net: Align AF-specific flowi structs to long ipv4: Fix fib_info->fib_metrics leak caif: fix a potential NULL dereference sctp: deal with multiple COOKIE_ECHO chunks ibmveth: Fix checksum offload failure handling ibmveth: Checksum offload is always disabled ibmveth: Fix issue with DMA mapping failure ibmveth: Fix DMA unmap error pch_gbe: support ML7831 IOH pch_gbe: added the process of FIFO over run error pch_gbe: fixed the issue which receives an unnecessary packet. sfc: Use 64-bit writes for TX push where possible Revert "sfc: Use write-combining to reduce TX latency" and follow-ups bnx2x: Fix ethtool advertisement bnx2x: Fix 578xx link LED bnx2x: Fix XMAC loopback test ... commit f78b68261e80899f81a21dfdf91e2a1456ea8175 Author: Jurgen Kramer Date: Sun Sep 4 18:01:42 2011 +0200 Bluetooth: add support for 2011 mac mini Today I noticed that the usb bluetooth adapter (BCM2046B1) on my 2011 mac mini was not working. I've created a patch to get it going. Signed-off-by: Jurgen Kramer Signed-off-by: Gustavo F. Padovan commit a63b723d02531f7add0b2b8a0e6a77ee176f1626 Author: Pieter-Augustijn Van Malleghem Date: Wed Sep 7 02:28:10 2011 -0400 Bluetooth: Add MacBookAir4,1 support This patch against current git adds the hardware ID for the Apple MacBookAir4,1, released in July 2011. The device features a BCM2046 USB chip. The patch was inspired by the previous modifications adding support for the MacBookAir3,x. Signed-off-by: Pieter-Augustijn Van Malleghem Signed-off-by: Gustavo F. Padovan commit 8be964d2364e8fbe302850f60d9d514c3e134510 Author: Chen Ganir Date: Tue Aug 30 13:58:28 2011 +0300 Bluetooth: Fixed BT ST Channel reg order Reordered the BT ST channel registration, to make sure that the event channel is registered before all others. This prevents a situation where incoming events may cause kernel panic in the ST driver if the event channel is not yet registered to handle incoming events.In addition, the deregistration of the channels was also modified, to be in the reversed order of the registration, to allow the event channel to be the last one unregistered. Signed-off-by: Chen Ganir Signed-off-by: Gustavo F. Padovan commit 2249b011432ca3dcce112f0f71e0f531b4bb9347 Author: Don Fry Date: Thu Sep 15 08:36:22 2011 -0700 iwlagn: workaround bug crashing some APs This patch reverts commit 9b7688328422b88a7a15dc0dc123ad9ab1a6e22d which was introduced in 2.6.38-rc1. It works around a problem where the iwlagn driver stimulates a bug crashing (requiring power cycle to recover) some APs under heavy traffic. CC: stable@kernel.org #2.6.39, #3.0.0 #3.1.0 Signed-off-by: Don Fry SIgned-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 3965ac00204e0ccd89e1e73ead4d2098dc8f7bd1 Author: Rajkumar Manoharan Date: Thu Sep 15 15:12:29 2011 +0530 wireless: Fix rate mask for scan request The scan request received from cfg80211_connect do not have proper rate mast. So the probe request sent on each channel do not have proper the supported rates ie. Cc: stable@kernel.org Reviewed-by: Johannes Berg Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit daabead1c32f331edcfb255fd973411c667977e8 Author: Larry Finger Date: Wed Sep 14 16:50:23 2011 -0500 rtl2800usb: Fix incorrect storage of MAC address on big-endian platforms The eeprom data is stored in little-endian order in the rt2x00 library. As it was converted to cpu order in the read routines, the data need to be converted to LE on a big-endian platform. Signed-off-by: Larry Finger Cc: Stable Signed-off-by: John W. Linville commit d331eb51e4d4190b2178c30fcafea54a94a577e8 Author: Larry Finger Date: Wed Sep 14 16:50:22 2011 -0500 rt2800pci: Fix compiler error on PowerPC Using gcc 4.4.5 on a Powerbook G4 with a PPC cpu, a complicated if statement results in incorrect flow, whereas the equivalent switch statement works correctly. Signed-off-by: Larry Finger Cc: stable Signed-off-by: John W. Linville commit 7cabafcea793c003503a118da58da358b0692930 Author: Stanislaw Gruszka Date: Wed Sep 14 16:47:50 2011 +0200 ipw2x00: fix rtnl mutex deadlock This fix regression introduced by: commit: ecb4433550f0620f3d1471ae7099037ede30a91e Author: Stanislaw Gruszka Date: Fri Aug 12 14:00:59 2011 +0200 mac80211: fix suspend/resume races with unregister hw Above commit add rtnl_lock() into wiphy_register(), what cause deadlock when initializing ipw2x00 driver, which itself call wiphy_register() from register_netdev() internal callback with rtnl mutex taken. To fix move wiphy_register() outside register_netdev(). This solution have side effect of not creating /sys/class/net/wlanX/phy80211 link, but that's a minor issue we can live with. Bisected-by: Witold Baryluk Bisected-by: Michael Witten Tested-by: Witold Baryluk Tested-by: Michael Witten Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit aa3d7eef398dd4f29045e9889b817d5161afe03e Author: Rajkumar Manoharan Date: Wed Sep 14 14:28:17 2011 +0530 wireless: Reset beacon_found while updating regulatory During the association, the regulatory is updated by country IE that reaps the previously found beacons. The impact is that after a STA disconnects *or* when for any reason a regulatory domain change happens the beacon hint flag is not cleared therefore preventing future beacon hints to be learned. This is important as a regulatory domain change or a restore of regulatory settings would set back the passive scan and no-ibss flags on the channel. This is the right place to do this given that it covers any regulatory domain change. Cc: stable@kernel.org Reviewed-by: Luis R. Rodriguez Signed-off-by: Rajkumar Manoharan Acked-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 8ea9ac0a47a179bf404b4f451e5e82cffe11940d Merge: 31dda0a 282cdb3 Author: John W. Linville Date: Thu Sep 15 15:37:02 2011 -0400 Merge branch 'master' of git://git.infradead.org/users/linville/wireless into for-davem commit 2d20a26a92f72e3bb658fe8ce99c3663756e9e7a Author: Oliver Neukum Date: Tue Aug 30 15:52:18 2011 +0200 Bluetooth: Fix timeout on scanning for the second time The checks for HCI_INQUIRY and HCI_MGMT were in the wrong order, so that second scans always failed. Signed-off-by: Oliver Neukum Signed-off-by: Gustavo F. Padovan commit 282cdb325aea4ebbc42ce753b47cc96145eb54bc Author: Johannes Berg Date: Mon Sep 12 12:09:10 2011 -0700 iwlagn: fix command queue timeout If the command queue is constantly busy, which can happen in P2P, the hangcheck timer will frequently find a command in it and will eventually reset the device because nothing sets the timestamp for this queue when commands are processed. Fix this by setting the timestamp when a command completes. Cc: stable@kernel.org #2.6.39, #3.0.0 #3.1.0 Signed-off-by: Johannes Berg SIgned-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 456fc37e4519f3f551830ce01c58ddaa35807204 Author: Johannes Berg Date: Mon Sep 12 21:08:25 2011 +0200 iwlagn: fix stack corruption Alexander reported a strange crash in iwlagn that Meenakshi and Wey couldn't reproduce. I just ran into the same issue and tracked it down to stack corruption. This fixes it. The problem was introduced in commit 4b8b99b6e650d0527f3a123744b7459976581d14 Author: Wey-Yi Guy Date: Fri Jul 8 14:29:48 2011 -0700 iwlagn: radio sensor offset in le16 format Cc: Wey-Yi Guy Cc: Meenakshi Venkataraman Reported-by: Alexander Diewald Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 6a6b3f3e13decfc4b97263a83ea4e80ac8cc89ae Author: Mohammed Shafi Shajakhan Date: Fri Sep 9 10:41:08 2011 +0530 ath9k: Fix kernel panic on unplugging the device when the device is yanked out ath_pci_remove starts doing the cleanups, unregistering the hardware etc. so we should bail out immediately when we get drv_flush callback from mac80211 when the card is being unplugged. the panic occurs after we had associated to an AP. EIP: 0060:[] EFLAGS: 00010246 CPU: 0 EIP is at ath_reset+0xa0/0x1c0 [ath9k] EAX: 00000000 EBX: 000697c0 ECX: 00000002 EDX: f3c3ccf0 ESI: 00000000 EDI: 00000000 EBP: f43e7b78 ESP: f43e7b50 DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 Process kworker/u:2 (pid: 182, ti=f43e6000 task=f3c3c7c0 task.ti=f43e6000) Stack: 0000002a 00000000 00000000 003e7b78 0000000f eaaa8500 ffffffea eaaa97c0 eaaaa000 00000001 f43e7ba8 fb315d23 f99e7721 ecece680 eaaac738 eaaa8500 eaaaa020 000000c8 000000c8 00000000 eaaa8d58 eaaa8500 f43e7bd0 fb080b29 Call Trace: [] ath9k_flush+0x103/0x170 [ath9k] [] __ieee80211_recalc_idle+0x2c9/0x400 [mac80211] [] ieee80211_recalc_idle+0x2e/0x60 [mac80211] [] ieee80211_mgd_deauth+0x173/0x210 [mac80211] [] ieee80211_deauth+0x19/0x20 [mac80211] [] __cfg80211_mlme_deauth+0xf3/0x140 [cfg80211] [] ? __mutex_lock_common+0x1f0/0x380 [] __cfg80211_disconnect+0x18d/0x1f0 [cfg80211] [] cfg80211_netdev_notifier_call+0x159/0x5c0 [cfg80211] [] ? packet_notifier+0x174/0x1f0 [] notifier_call_chain+0x82/0xb0 [] raw_notifier_call_chain+0x1f/0x30 [] call_netdevice_notifiers+0x2c/0x60 [] ? trace_hardirqs_on_caller+0xf4/0x180 [] __dev_close_many+0x4c/0xd0 [] dev_close_many+0x6d/0xc0 [] rollback_registered_many+0x93/0x1c0 [] ? trace_hardirqs_on+0xb/0x10 [] unregister_netdevice_many+0x15/0x50 [] ieee80211_remove_interfaces+0x7b/0xb0 [mac80211] [] ieee80211_unregister_hw+0x4b/0x110 [mac80211] [] ath9k_deinit_device+0x3a/0x60 [ath9k] [] ath_pci_remove+0x46/0x90 [ath9k] [] pci_device_remove+0x44/0x100 [] __device_release_driver+0x64/0xb0 [] device_release_driver+0x27/0x40 [] bus_remove_device+0x7b/0xa0 [] device_del+0xf1/0x180 [] device_unregister+0x10/0x20 [] pci_stop_bus_device+0x6e/0x80 [] pci_remove_bus_device+0x12/0xa0 [] pciehp_unconfigure_device+0x89/0x180 [] ? mark_held_locks+0x64/0x100 [] ? __mutex_unlock_slowpath+0xaf/0x140 [] pciehp_disable_slot+0x64/0x1b0 [] pciehp_power_thread+0xd0/0x100 [] ? process_one_work+0x100/0x4d0 [] process_one_work+0x17c/0x4d0 [] ? process_one_work+0x100/0x4d0 [] ? queue_interrupt_event+0xa0/0xa0 [] worker_thread+0x13b/0x320 [] ? trace_hardirqs_on+0xb/0x10 [] ? manage_workers+0x1e0/0x1e0 [] kthread+0x84/0x90 [] ? __init_kthread_worker+0x60/0x60 [] kernel_thread_helper+0x6/0x10 Cc: Rajkumar Manoharan Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 4bae7d976976fa52d345805ba686934cd548343e Author: Johannes Berg Date: Tue Sep 6 12:47:39 2011 +0200 mac80211: fix missing sta_lock in __sta_info_destroy Since my commit 34e895075e21be3e21e71d6317440d1ee7969ad0 ("mac80211: allow station add/remove to sleep") there is a race in mac80211 when it clears the TIM bit because a sleeping station disconnected, the spinlock isn't held around the relevant code any more. Use the right API to acquire the spinlock correctly. Cc: stable@kernel.org [2.6.34+] Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit bac2555c6d86387132930af4d14cb47c4dd3f4f7 Author: George Date: Sat Sep 3 10:58:48 2011 -0500 rtlwifi: Fix problem when switching connections The driver fails to clear encryption keys making it impossible to switch connections. Signed-off-by: George Signed-off-by: Larry Finger Cc: Stable [2.6.39+] Signed-off-by: John W. Linville commit 3401dc6eba788ebc7c14ce51018d775b1c263399 Author: George Date: Sat Sep 3 10:58:47 2011 -0500 rtlwifi: rtl8192su: Fix problem connecting to HT-enabled AP The driver fails to connect to 802.11n-enabled APs. The patch fixes Bug #42262. Signed-off-by: George Signed-off-by: Larry Finger Cc: Stable [2.6.39+] Signed-off-by: John W. Linville commit d2f152878d457a84f3708acee5f682322386a79b Author: Randy Dunlap Date: Thu Sep 8 10:16:50 2011 -0700 wireless: fix kernel-doc warning in net/cfg80211.h Fix kernel-doc warning in net/cfg80211.h: Warning(include/net/cfg80211.h:1884): No description found for parameter 'registered' Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 0e4660cbe51276e86dbdab17228733dbcdb49249 Author: Felix Fietkau Date: Mon Aug 29 10:06:14 2011 +0200 ath9k_hw: fix calibration on 5 ghz ADC calibrations cannot run on 5 GHz with fast clock enabled. They need to be disabled, otherwise they'll hang and IQ mismatch calibration will not be run either. Signed-off-by: Felix Fietkau Reported-by: Adrian Chadd Cc: stable@kernel.org Signed-off-by: John W. Linville commit 7c2510120e9b43b0caf32c3786a6ab831f7d9e87 Author: Stanislaw Gruszka Date: Fri Aug 26 17:24:59 2011 +0200 iwlegacy: fix BUG_ON(info->control.rates[0].idx < 0) When trying to connect to 5GHz we can provide negative index to mac80211 what trigger BUG_ON. Reason of iwl-3945-rs malfunction on 5GHz is unknown and needs further investigation. For now, to do not trigger a bug, correct value and just print WARNING. Address bug: https://bugzilla.redhat.com/show_bug.cgi?id=730653 Reported-and-tested-by: Jan Teichmann Cc: stable@kernel.org Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit 1c1bdd324cd50ac55f7ebf95ef249d946c6e4361 Author: Rajkumar Manoharan Date: Fri Aug 26 12:42:11 2011 +0530 ath9k_hw: Fix init mode register regression The commit 172805ad46b78717a738ca5c7908c68f0326d3a9 overwirtes additional clock settings of AR9330 to all AR9300 chips. Cc: stable@kernel.org Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit e2e6be56df37c371f564e127c154036b0c2211a1 Merge: bc909d9 8b2a382 Author: John W. Linville Date: Fri Aug 26 10:33:51 2011 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem commit 8b2a3827bb12430d932cd479b22d906baf08c212 Author: Mohammed Shafi Shajakhan Date: Wed Aug 24 21:38:07 2011 +0530 ath9k: Fix PS wrappers in ath9k_set_coverage_class this callback is called during suspend/resume and also via iw command. it configures parameters like sifs, slottime, acktimeout in ath9k_hw_init_global_settings where few REG_READ, REG_RMW are also done and hence the need for PS wrappers Cc: stable@kernel.org Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 66cb54bd24086b2d871a03035de9b0e79b2b725e Author: Alexey Khoroshilov Date: Wed Aug 24 00:44:32 2011 +0400 carl9170: Fix mismatch in carl9170_op_set_key mutex lock-unlock If is_main_vif(ar, vif) reports that we have to fall back to software encryption, we goto err_softw; before locking ar->mutex. As a result, we have unprotected call to carl9170_set_operating_mode and unmatched mutex_unlock. The patch fix the issue by adding mutex_lock before goto. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov Cc: Acked-By: Christian Lamparter Signed-off-by: John W. Linville commit 7a5e4877c14de0827dbda8efa5080089757a8733 Author: Luciano Coelho Date: Tue Aug 23 11:42:25 2011 +0300 wl12xx: add max_sched_scan_ssids value to the hw description After commit 5a865ba, we require a separate value to indicate the number of supported SSIDs in scheduled scans. This patch adds a proper value to the wl12xx driver. This fixes a regression in 3.1-rc3 where scheduled scans were not working properly with the wl12xx driver. Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit a15f1c45f393982196c981a8df8b534cc9f3bb80 Author: Ido Yariv Date: Mon Aug 22 23:19:49 2011 +0300 wl12xx: Fix validation of pm_runtime_get_sync return value wl1271_sdio_power_on checks if the return value of pm_runtime_get_sync is non-zero, and if so bails out. However, pm_runtime_get_sync can return a positive number which does not suggest an error has occurred. This is problematic for two reasons: 1. The function will needlessly bail out without decrementing back the runtime PM reference counter. 2. wl1271_power_on only checks if wl1271_power_on return value is negative. This means that wl1271_power_on will continue even if wl1271_sdio_power_on bailed out. As a result, sdio transactions will be initiated without properly enabling the sdio function and claiming the host. This could even lead to a kernel panic. Fix this by only checking that the return value of pm_runtime_get_sync is non-negative. Signed-off-by: Ido Yariv Acked-by: Luciano Coelho Signed-off-by: John W. Linville commit 80900d0140a7648587982c8f299830e900e49165 Author: Ido Yariv Date: Mon Aug 22 23:19:48 2011 +0300 wl12xx: Remove obsolete testmode NVS push command The testmode NVS push command is no longer in use. In addition, it has several implementation issues that prevent it from working correctly: 1. wl1271_tm_cmd_configure relies on wl->chip.id being set. However, since the device was not necessarily booted by the time the function is called, wl->chip.id will be initialized to 0. 2. The NVS file is fetched by calling request_firmware() before it is possible to push an NVS file. 3. The maximum allowed size of nl binary payloads is not sufficient for pushing NVS files. 4. Pushing 128x NVS files will always fail due to a bug in the validation code. 5. In case the pushed NVS file is found invalid, the mutex will be kept locked and the nvs member will become a dangling pointer. Since this feature is not being used, remove it completely instead of fixing it. Signed-off-by: Ido Yariv Acked-by: Luciano Coelho Signed-off-by: John W. Linville commit b503c7a273c0a3018ad11ea8c513c639120afbf4 Author: Senthil Balasubramanian Date: Fri Aug 19 18:43:06 2011 +0530 ath9k_hw: Fix STA (AR9485) bringup issue due to incorrect MAC address Due to some recent optimization done in the way the mac address bytes are written into the OTP memory, some AR9485 chipsets were forced to use the first byte from the eeprom template and the remaining bytes are read from OTP. AR9485 happens to use generic eeprom template which has 0x1 as the first byte causes issues in bringing up the card. So fixed the eeprom template accordingly to address the issue. Cc: stable@kernel.org Cc: Paul Stewart Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit 543cc38c8fe86deba4169977c61eb88491036837 Author: Stanislaw Gruszka Date: Fri Aug 12 14:02:04 2011 +0200 rt2x00: do not drop usb dev reference counter on suspend When hibernating ->resume may not be called by usb core, but disconnect and probe instead, so we do not increase the counter after decreasing it in ->supend. As a result we free memory early, and get crash when unplugging usb dongle. BUG: unable to handle kernel paging request at 6b6b6b9f IP: [] driver_sysfs_remove+0x10/0x30 *pdpt = 0000000034f21001 *pde = 0000000000000000 Pid: 20, comm: khubd Not tainted 3.1.0-rc1-wl+ #20 LENOVO 6369CTO/6369CTO EIP: 0060:[] EFLAGS: 00010202 CPU: 1 EIP is at driver_sysfs_remove+0x10/0x30 EAX: 6b6b6b6b EBX: f52bba34 ECX: 00000000 EDX: 6b6b6b6b ESI: 6b6b6b6b EDI: c0a0ea20 EBP: f61c9e68 ESP: f61c9e64 DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 Process khubd (pid: 20, ti=f61c8000 task=f6138270 task.ti=f61c8000) Call Trace: [] __device_release_driver+0x1f/0xa0 [] device_release_driver+0x20/0x40 [] bus_remove_device+0x84/0xe0 [] ? device_remove_attrs+0x2a/0x80 [] device_del+0xe7/0x170 [] usb_disconnect+0xd4/0x180 [] hub_thread+0x691/0x1600 [] ? wake_up_bit+0x30/0x30 [] ? complete+0x49/0x60 [] ? hub_disconnect+0xd0/0xd0 [] ? hub_disconnect+0xd0/0xd0 [] kthread+0x74/0x80 [] ? kthread_worker_fn+0x150/0x150 [] kernel_thread_helper+0x6/0x10 Cc: stable@kernel.org Signed-off-by: Stanislaw Gruszka Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit ecb4433550f0620f3d1471ae7099037ede30a91e Author: Stanislaw Gruszka Date: Fri Aug 12 14:00:59 2011 +0200 mac80211: fix suspend/resume races with unregister hw Do not call ->suspend, ->resume methods after we unregister wiphy. Also delete sta_clanup timer after we finish wiphy unregister to avoid this: WARNING: at lib/debugobjects.c:262 debug_print_object+0x85/0xa0() Hardware name: 6369CTO ODEBUG: free active (active state 0) object type: timer_list hint: sta_info_cleanup+0x0/0x180 [mac80211] Modules linked in: aes_i586 aes_generic fuse bridge stp llc autofs4 sunrpc cpufreq_ondemand acpi_cpufreq mperf ext2 dm_mod uinput thinkpad_acpi hwmon sg arc4 rt2800usb rt2800lib crc_ccitt rt2x00usb rt2x00lib mac80211 cfg80211 i2c_i801 iTCO_wdt iTCO_vendor_support e1000e ext4 mbcache jbd2 sd_mod crc_t10dif sr_mod cdrom yenta_socket ahci libahci pata_acpi ata_generic ata_piix i915 drm_kms_helper drm i2c_algo_bit video [last unloaded: microcode] Pid: 5663, comm: pm-hibernate Not tainted 3.1.0-rc1-wl+ #19 Call Trace: [] warn_slowpath_common+0x6d/0xa0 [] ? debug_print_object+0x85/0xa0 [] ? debug_print_object+0x85/0xa0 [] warn_slowpath_fmt+0x2e/0x30 [] debug_print_object+0x85/0xa0 [] ? sta_info_alloc+0x1a0/0x1a0 [mac80211] [] debug_check_no_obj_freed+0xe2/0x180 [] kfree+0x8b/0x150 [] cfg80211_dev_free+0x7e/0x90 [cfg80211] [] wiphy_dev_release+0xd/0x10 [cfg80211] [] device_release+0x19/0x80 [] kobject_release+0x7a/0x1c0 [] ? rtnl_unlock+0x8/0x10 [] ? wiphy_resume+0x6b/0x80 [cfg80211] [] ? kobject_del+0x30/0x30 [] kref_put+0x2d/0x60 [] kobject_put+0x1d/0x50 [] ? mutex_lock+0x14/0x40 [] put_device+0xf/0x20 [] dpm_resume+0xca/0x160 [] hibernation_snapshot+0xcd/0x260 [] ? freeze_processes+0x3f/0x90 [] hibernate+0xcb/0x1e0 [] ? pm_async_store+0x40/0x40 [] state_store+0xa0/0xb0 [] ? pm_async_store+0x40/0x40 [] kobj_attr_store+0x20/0x30 [] sysfs_write_file+0x94/0xf0 [] vfs_write+0x9a/0x160 [] ? sysfs_open_file+0x200/0x200 [] sys_write+0x3d/0x70 [] sysenter_do_call+0x12/0x28 Cc: stable@kernel.org Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit 4475a0a93f368e57d5306d4cbe9318e8c1c90c41 Merge: 16a9d06 687beaa Author: John W. Linville Date: Mon Aug 22 14:20:09 2011 -0400 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth commit eb18fa5bdb935b6c3b1c93fadf3fbd95bfb103ed Merge: fbe5e29 16a9d06 Author: John W. Linville Date: Mon Aug 22 14:16:07 2011 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem commit 16a9d06c753abc44f66f88e03bbecb3f1e45d71b Author: Emmanuel Grumbach Date: Sat Aug 13 09:02:44 2011 -0700 iwlagn: sysfs couldn't find the priv pointer This bug has been introduced by: d593411084a56124aa9d80aafa15db8463b2d8f7 Author: Emmanuel Grumbach Date: Mon Jul 11 10:48:51 2011 +0300 iwlagn: simplify the bus architecture Revert part of the buggy patch: dev_get_drvdata will now return iwl_priv as it did before the patch. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 4eb60d869fdad7acd098b53bfd1863c311d8933d Author: Emmanuel Grumbach Date: Sat Aug 13 09:02:43 2011 -0700 Revert "iwlagn: sysfs couldn't find the priv pointer" This reverts commit cc1a93e68f6c0d736b771f0746e8e4186f483fdc. This fix introduced a bug: bad pointer in unload. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit f8afdf481f0fef5e170c6c928cec42879d505654 Author: Julia Lawall Date: Fri Aug 12 13:31:30 2011 -0400 drivers/net/wireless/wl12xx: add missing kfree In each case, the freed data should be freed in the error handling code as well. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @exists@ local idexpression x; statement S,S1; expression E; identifier fl; expression *ptr != NULL; @@ x = \(kmalloc\|kzalloc\|kcalloc\)(...); ... if (x == NULL) S <... when != x when != if (...) { <+...kfree(x)...+> } when any when != true x == NULL x->fl ...> ( if (x == NULL) S1 | if (...) { ... when != x when forall ( return \(0\|<+...x...+>\|ptr\); | * return ...; ) } ) // Signed-off-by: Julia Lawall Acked-by: Luciano Coelho Signed-off-by: John W. Linville commit 687beaa0d1d937c327e2f97b4b4fa6c23ca70624 Author: Peter Hurley Date: Fri Aug 5 10:53:52 2011 -0400 Bluetooth: cmtp: Fix session cleanup on failed conn add Once the session thread is running, cleanup must be handled by the session thread only. Signed-off-by: Peter Hurley Signed-off-by: Gustavo F. Padovan commit ff062ea109217329b88693bc9081da893eb8b71b Author: Peter Hurley Date: Fri Aug 5 10:52:01 2011 -0400 Bluetooth: hidp: Don't release device ref if never held When an hidp connection is added for a boot protocol input device, don't release a device reference that was never acquired. The device reference is acquired when the session is linked to the session list (which hasn't happened yet when hidp_setup_input is called). Signed-off-by: Peter Hurley Signed-off-by: Gustavo F. Padovan commit 615aedd6e5add8104f031b0d547285652d04d330 Author: Peter Hurley Date: Fri Aug 5 10:51:50 2011 -0400 Bluetooth: hidp: Only free input device if failed register When an hidp connection is added for a boot protocol input device, only free the allocated device if device registration fails. Subsequent failures should only unregister the device (the input device api documents that unregister will also free the allocated device). Signed-off-by: Peter Hurley Signed-off-by: Gustavo F. Padovan commit 1c97e94c0b7c56319754ee6f9ccd2e93fe1ee2b3 Author: Peter Hurley Date: Fri Aug 5 10:51:34 2011 -0400 Bluetooth: hidp: Fix memory leak of cached report descriptor Free the cached HID report descriptor on thread terminate. Signed-off-by: Peter Hurley Signed-off-by: Gustavo F. Padovan commit e9d5cb541b22aa651edc29990092ec5f8174cd39 Author: Peter Hurley Date: Fri Aug 5 10:51:26 2011 -0400 Bluetooth: hidp: Fix session cleanup on failed conn add Once the session thread is running, cleanup must be handled by the session thread only. Signed-off-by: Peter Hurley Signed-off-by: Gustavo F. Padovan commit 7176522cdca1f0b78a1434b41761f0334511822a Author: Peter Hurley Date: Fri Aug 5 10:44:21 2011 -0400 Bluetooth: cmtp: Fix deadlock in session deletion Commit fada4ac339 introduced the usage of kthread API. kthread_stop is a blocking function which returns only when the thread exits. In this case, the thread can't exit because it's waiting for the write lock, which is being held by cmtp_del_connection() which is waiting for the thread to exit -- deadlock. Revert cmtp_reset_ctr to its original behavior: non-blocking signalling for the session to terminate. Signed-off-by: Peter Hurley Signed-off-by: Gustavo F. Padovan commit 751c10a56802513a6b057c8cf1552cecc1c9afde Author: Peter Hurley Date: Fri Aug 5 10:41:35 2011 -0400 Bluetooth: bnep: Fix deadlock in session deletion Commit f4d7cd4a4c introduced the usage of kthread API. kthread_stop is a blocking function which returns only when the thread exits. In this case, the thread can't exit because it's waiting for the write lock, which is being held by bnep_del_connection() which is waiting for the thread to exit -- deadlock. Use atomic_t/wake_up_process instead to signal to the thread to exit. Signed-off-by: Jaikumar Ganesh Signed-off-by: Peter Hurley Signed-off-by: Gustavo F. Padovan commit 7bdb8a5cf17f66614a9897645efcd4ccc27535ee Author: Szymon Janc Date: Tue Jul 26 22:46:54 2011 +0200 Bluetooth: Don't use cmd_timer to timeout HCI reset command No command should be send before Command Complete event for HCI reset is received. This fix regression introduced by commit 6bd32326cda(Bluetooth: Use proper timer for hci command timout) for chips whose reset command takes longer to complete (e.g. CSR) resulting in next command being send before HCI reset completed. Signed-off-by: Szymon Janc Signed-off-by: Gustavo F. Padovan commit 6be6b11f006840ba7d8d4b959b3fa0c522f8468a Author: Chen Ganir Date: Thu Jul 28 15:42:09 2011 +0300 Bluetooth: Fixed wrong L2CAP Sock timer value L2CAP connection timeout needs to be assigned as miliseconds and not as jiffies. Signed-off-by: Chen Ganir Signed-off-by: Gustavo F. Padovan commit a71a0cf4e9cdb1c43843977a1efc43f96f6efc21 Author: Peter Hurley Date: Mon Jul 25 18:36:26 2011 -0400 Bluetooth: l2cap: Fix lost wakeup waiting for ERTM acks Fix race condition which can result in missing wakeup during l2cap socket shutdown. Signed-off-by: Peter Hurley Signed-off-by: Gustavo F. Padovan commit 3a3f5c7df55a1294c9e6e2d0b8cea604b137438f Author: Peter Hurley Date: Sun Jul 24 00:11:10 2011 -0400 Bluetooth: cmtp: Fix lost wakeup of session thread Fix race condition which can result in missing the wakeup intended to stop the session thread. Signed-off-by: Peter Hurley Signed-off-by: Gustavo F. Padovan commit 38d57555616afcdad7381b02b523d494327494cd Author: Peter Hurley Date: Sun Jul 24 00:11:07 2011 -0400 Bluetooth: bnep: Fix lost wakeup of session thread Fix race condition which can result in missing the wakeup intended to stop the session thread. Signed-off-by: Peter Hurley Signed-off-by: Gustavo F. Padovan commit 552b0d3cb9ff648aa503011ef50ca24019cd0f5f Author: Peter Hurley Date: Sun Jul 24 00:11:01 2011 -0400 Bluetooth: sco: Fix lost wakeups waiting to accept socket Fix race conditions which can cause lost wakeups (or missed signals) while waiting to accept a sco socket connection. Signed-off-by: Peter Hurley Signed-off-by: Gustavo F. Padovan commit f9a3c20aa07462108fc6fd759dea956053f020bb Author: Peter Hurley Date: Sun Jul 24 00:10:52 2011 -0400 Bluetooth: l2cap: Fix lost wakeups waiting to accept socket Fix race conditions which can cause lost wakeups (or misssed signals) while waiting to accept an l2cap socket connection. Signed-off-by: Peter Hurley Signed-off-by: Gustavo F. Padovan commit 9be4e3fbf2d3603e7a7010ede0697166738a788b Author: Peter Hurley Date: Sun Jul 24 00:10:46 2011 -0400 Bluetooth: Fix lost wakeups waiting for sock state change Fix race conditions which can cause lost wakeups while waiting for sock state to change. Signed-off-by: Peter Hurley Signed-off-by: Gustavo F. Padovan commit 950e2d51e866623e4c360280aa63b85ab66d3403 Author: Peter Hurley Date: Sun Jul 24 00:10:41 2011 -0400 Bluetooth: rfcomm: Fix lost wakeups waiting to accept socket Fix race conditions which can cause lost wakeups (or missed signals) while waiting to accept an rfcomm socket connection. Signed-off-by: Peter Hurley Signed-off-by: Gustavo F. Padovan commit e5842cdb0f4f2c68f6acd39e286e5d10d8c073e8 Author: Peter Hurley Date: Sun Jul 24 00:10:35 2011 -0400 Bluetooth: rfcomm: Remove unnecessary krfcommd event Removed superfluous event handling which was used to signal that the rfcomm kthread had been woken. This appears to have been used to prevent lost wakeups. Correctly ordering when the task state is set to TASK_INTERRUPTIBLE is sufficient to prevent lost wakeups. To prevent wakeups which occurred prior to initially setting TASK_INTERRUPTIBLE from being lost, the main work of the thread loop - rfcomm_process_sessions() - is performed prior to sleeping. Signed-off-by: Peter Hurley Signed-off-by: Gustavo F. Padovan commit 8e7c3d2e4ba18ee4cdcc1f89aec944fbff4ce735 Author: Ricardo Mendoza Date: Wed Jul 13 16:04:29 2011 +0100 Bluetooth: Add Toshiba laptops AR30XX device ID Blacklist Toshiba-branded AR3011 based AR5B195 [0930:0215] and add to ath3k.c for firmware loading. Signed-off-by: Ricardo Mendoza Signed-off-by: Gustavo F. Padovan commit 4935f1c164ac528dff3538f97953b385ba500710 Author: Paul Bolle Date: Tue Aug 9 17:16:28 2011 +0200 Bluetooth: btusb: be quiet on device disconnect Disabling the bluetooth usb device embedded in (some) ThinkPads tends to lead to errors like these: btusb_bulk_complete: hci0 urb ffff88011b9bfd68 failed to resubmit (19) btusb_intr_complete: hci0 urb ffff88011b46a318 failed to resubmit (19) btusb_bulk_complete: hci0 urb ffff88011b46a000 failed to resubmit (19) That is because usb_disconnect() doesn't "quiesces" pending urbs. Disconnecting a device is a normal thing to happen so it's no big deal that usb_submit_urb() returns -ENODEV. The simplest way to get rid of these errors is to stop treating that return as an error. Trivial, actually. While we're at it, add comments to be explicit about the reasons we're not complaining about -EPERM and -ENODEV. Signed-off-by: Paul Bolle Signed-off-by: Gustavo F. Padovan commit 8475e2336cf80ba6e7b27715b4b3214d73c211ab Author: Dan Carpenter Date: Wed Aug 3 17:22:45 2011 +0300 Bluetooth: unlock if allocation fails in hci_blacklist_add() There was a small typo here so we never actually hit the goto which would call hci_dev_unlock_bh(). Signed-off-by: Dan Carpenter Signed-off-by: Gustavo F. Padovan commit 674db1344443204b6ce3293f2df8fd1b7665deea Author: Stanislaw Gruszka Date: Wed Aug 10 15:32:24 2011 +0200 rt2x00: fix crash in rt2800usb_get_txwi Patch should fix this oops: BUG: unable to handle kernel NULL pointer dereference at 000000a0 IP: [] rt2800usb_get_txwi+0x19/0x70 [rt2800usb] *pdpt = 0000000000000000 *pde = f000ff53f000ff53 Oops: 0000 [#1] SMP Pid: 198, comm: kworker/u:3 Tainted: G W 3.0.0-wl+ #9 LENOVO 6369CTO/6369CTO EIP: 0060:[] EFLAGS: 00010283 CPU: 1 EIP is at rt2800usb_get_txwi+0x19/0x70 [rt2800usb] EAX: 00000000 EBX: f465e140 ECX: f4494960 EDX: ef24c5f8 ESI: 810f21f5 EDI: f1da9960 EBP: f4581e80 ESP: f4581e70 DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 Process kworker/u:3 (pid: 198, ti=f4580000 task=f4494960 task.ti=f4580000) Call Trace: [] rt2800_txdone_entry+0x2f/0xf0 [rt2800lib] [] ? warn_slowpath_common+0x7d/0xa0 [] ? rt2800usb_work_txdone+0x288/0x360 [rt2800usb] [] ? rt2800usb_work_txdone+0x288/0x360 [rt2800usb] [] rt2800usb_work_txdone+0x263/0x360 [rt2800usb] [] process_one_work+0x186/0x440 [] ? process_one_work+0x10a/0x440 [] ? rt2800usb_probe_hw+0x120/0x120 [rt2800usb] [] worker_thread+0x133/0x310 [] ? trace_hardirqs_on+0xb/0x10 [] ? manage_workers+0x1e0/0x1e0 [] kthread+0x7c/0x90 [] ? __init_kthread_worker+0x60/0x60 [] kernel_thread_helper+0x6/0x1 Oops might happen because we check rt2x00queue_empty(queue) twice, but this condition can change and we can process entry in rt2800_txdone_entry(), which was already processed by rt2800usb_txdone_entry_check() -> rt2x00lib_txdone_noinfo() and has nullify entry->skb . Reported-by: Justin Piszcz Cc: stable@kernel.org Signed-off-by: Stanislaw Gruszka Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit df71c9cfceea801e7e26e2c74241758ef9c042e5 Author: Stanislaw Gruszka Date: Wed Aug 10 15:32:23 2011 +0200 rt2x00: fix order of entry flags modification In rt2800usb_work_txdone we check flags in order: - ENTRY_OWNER_DEVICE_DATA - ENTRY_DATA_STATUS_PENDING - ENTRY_DATA_IO_FAILED Modify flags in separate order in rt2x00usb_interrupt_txdone, to avoid processing entries in _txdone with wrong flags or skip processing ready entries. Reported-by: Justin Piszcz Cc: stable@kernel.org Signed-off-by: Stanislaw Gruszka Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 4b1bfb7d2d125af6653d6c2305356b2677f79dc6 Author: Stanislaw Gruszka Date: Wed Aug 10 15:32:22 2011 +0200 rt2x00: fix crash in rt2800usb_write_tx_desc Patch should fix this oops: BUG: unable to handle kernel NULL pointer dereference at 000000a0 IP: [] rt2800usb_write_tx_desc+0x18/0xc0 [rt2800usb] *pdpt = 000000002408c001 *pde = 0000000024079067 *pte = 0000000000000000 Oops: 0000 [#1] SMP EIP: 0060:[] EFLAGS: 00010282 CPU: 0 EIP is at rt2800usb_write_tx_desc+0x18/0xc0 [rt2800usb] EAX: 00000035 EBX: ef2bef10 ECX: 00000000 EDX: d40958a0 ESI: ef1865f8 EDI: ef1865f8 EBP: d4095878 ESP: d409585c DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 Call Trace: [] rt2x00queue_write_tx_frame+0x155/0x300 [rt2x00lib] [] rt2x00mac_tx+0x7c/0x370 [rt2x00lib] [] ? mark_held_locks+0x62/0x90 [] ? _raw_spin_unlock_irqrestore+0x35/0x60 [] ? trace_hardirqs_on_caller+0x5a/0x170 [] ? trace_hardirqs_on+0xb/0x10 [] __ieee80211_tx+0x5c/0x1e0 [mac80211] [] ieee80211_tx+0xbc/0xe0 [mac80211] [] ? ieee80211_tx+0x23/0xe0 [mac80211] [] ieee80211_xmit+0xc1/0x200 [mac80211] [] ? ieee80211_tx+0xe0/0xe0 [mac80211] [] ? lock_release_holdtime+0x35/0x1b0 [] ? ieee80211_subif_start_xmit+0x446/0x5f0 [mac80211] [] ieee80211_subif_start_xmit+0x29d/0x5f0 [mac80211] [] ? ieee80211_subif_start_xmit+0x3e4/0x5f0 [mac80211] [] ? sock_setsockopt+0x6a8/0x6f0 [] ? sock_setsockopt+0x520/0x6f0 [] dev_hard_start_xmit+0x2ef/0x650 Oops might happen because we perform parallel putting new entries in a queue (rt2x00queue_write_tx_frame()) and removing entries after finishing transmitting (rt2800usb_work_txdone()). There are cases when _txdone may process an entry that was not fully send and nullify entry->skb . To fix check in _txdone if entry has flags that indicate pending transmission and wait until flags get cleared. Reported-by: Justin Piszcz Cc: stable@kernel.org Signed-off-by: Stanislaw Gruszka Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit a06d8aba0e3f7faa30e95b12220b0c90bca41a07 Merge: aa02bc7 059c438 Author: John W. Linville Date: Thu Aug 11 13:37:26 2011 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem commit 059c4383550b158bc1b6d34d8ab085e81cb3d71b Author: Julia Lawall Date: Mon Aug 8 13:18:03 2011 +0200 drivers/net/wireless/wl1251: add missing kfree In each case, the kfree already at the end of the function is also needed in the error case. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @exists@ local idexpression x; statement S,S1; expression E; identifier fl; expression *ptr != NULL; @@ x = \(kmalloc\|kzalloc\|kcalloc\)(...); ... if (x == NULL) S <... when != x when != if (...) { <+...kfree(x)...+> } when any when != true x == NULL x->fl ...> ( if (x == NULL) S1 | if (...) { ... when != x when forall ( return \(0\|<+...x...+>\|ptr\); | * return ...; ) } ) // Signed-off-by: Julia Lawall Signed-off-by: John W. Linville commit bdc71bc59231f5542af13b5061b9ab124d093050 Author: Bob Copeland Date: Sun Aug 7 19:36:07 2011 -0400 ath5k: fix error handling in ath5k_beacon_send This cleans up error handling for the beacon in case of dma mapping failure. We need to free the skb when dma mapping fails instead of nulling and leaking the pointer, and we should bail out to avoid giving the hardware the bad descriptor. Finally, we need to perform the null check after trying to update the beacon, or else beacons will never be sent after a single mapping failure. Cc: stable@kernel.org Signed-off-by: Bob Copeland Signed-off-by: John W. Linville commit 276b02e2a0ada2e0196852c312560ffdabcebddc Author: Anthony Bourguignon Date: Fri Aug 5 07:46:32 2011 +0200 rt2x00: Add rt2870 device id for Dvico usb key This patch add a device id for the wifi usb keys shiped by DVICO with some of their tvix hardware. Signed-off-by: Anthony Bourguignon Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 118c9db51e7acaf8f16deae8311cce6588b83e31 Author: Alex Hacker Date: Thu Aug 4 13:47:32 2011 +0600 ath9k: fix a misprint which leads to incorrect calibration This patch addresses an issue with incorrect HW register AR_PHY_TX_IQCAL_CORR_COEFF_B1 definition which leads to incorrect clibration. Cc: stable@kernel.org Signed-off-by: Alex Hacker Signed-off-by: John W. Linville commit b8b1ec61c006ed1d3104093556544e858cc2ddd1 Author: Ivo van Doorn Date: Wed Aug 3 21:09:49 2011 +0200 rt2x00: Add new rt73 buffalo USB id Reported-by: Maik-Holger Freudenberg Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 03f18fa16cd805916a56d027b4ee52ba26e6d6ab Author: Larry Finger Date: Tue Aug 2 16:52:33 2011 -0500 rtlwifi: rtl892cu: New USB IDs This patch fixes several problems in the USB_DEVICE table, including missing IDs, reversed vendor/product codes, and a duplicate ID. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 1fa707aa3e5c43b094983787267d80d0dfa44e4d Author: Rajkumar Manoharan Date: Fri Jul 29 17:38:17 2011 +0530 ath9k_hw: update PMU to improve ripple issue for AR9485 The commit ebefce3d13f8b5a871337ff7c3821ee140c1ea8a failed to set proper PMU value to address ripple issue for AR9485. Cc: stable@kernel.org Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 15052f81d255eac44e745bc630b36aa86779ad9d Author: Rajkumar Manoharan Date: Fri Jul 29 17:38:15 2011 +0530 ath9k_hw: Fix incorrect Tx control power in AR9003 template CTL power data incorrect in ctlPowerData_2G field of ar9300_eeprom. Setting incorrect CTL power in calibration is causing lower tx power. Tx power was reported as 3dBm while operating in channel 6 HT40+/ in channel 11 HT40- due to CTL powers in the calibration is set to zero. Cc: stable@kernel.org Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 5b36c9b4a9872f7852b8ce7cffbfc2f6d6c25371 Author: Hauke Mehrtens Date: Sat Jul 23 13:57:33 2011 +0200 b43: read correct register on bcma bus. This causes an databus error on a Broadcom SoC using bcma. Signed-off-by: Hauke Mehrtens Signed-off-by: John W. Linville commit 07d952dc669bb70a9716a81e140e89b7d4969f09 Merge: 5fdb324 c15fea2 Author: Linus Torvalds Date: Fri Aug 5 06:42:01 2011 -1000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (54 commits) ipv6: check for IPv4 mapped addresses when connecting IPv6 sockets mlx4: decreasing ref count when removing mac net: Fix security_socket_sendmsg() bypass problem. net: Cap number of elements for sendmmsg net: sendmmsg should only return an error if no messages were sent ixgbe: fix PHY link setup for 82599 ixgbe: fix __ixgbe_notify_dca() bail out code igb: fix WOL on second port of i350 device e1000e: minor re-order of #include files e1000e: remove unnecessary check for NULL pointer intel drivers: repair missing flush operations macb: restore wrap bit when performing underrun cleanup cdc_ncm: fix endianness problem. irda: use PCI_VENDOR_ID_* mlx4: Fixing Ethernet unicast packet steering net: fix NULL dereferences in check_peer_redir() bnx2x: Clear MDIO access warning during first driver load bnx2x: Fix BCM578xx MAC test bnx2x: Fix BCM54618se invalid link indication bnx2x: Fix BCM84833 link ... commit a5d5a914770a81a1f775be2ee35b9fa8fd19d381 Merge: d5eab91 f352910 Author: John W. Linville Date: Wed Aug 3 09:18:21 2011 -0400 Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem commit f35291082294ca6737953bbe4e9491ede04ab822 Author: Wey-Yi Guy Date: Tue Aug 2 09:08:37 2011 -0700 iwlagn: 5000 do not support idle mode 5000 series has issue supporting power save idle mode: commit 9dc2153315650eae220898668b6aa56a25c130be iwlwifi: always support idle mode for agn devices For agn devices, always support idle mode which help power consumption in idle unassociated state. the above changes cause 5000 become not stable when power management is "on" http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2312 Cc: stable@kernel.org #2.6.39, #3.0.0 Reported-by: Devin J Pohly Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 00898a47269ae5e6dda04defad00234b96692d95 Author: Stanislaw Gruszka Date: Tue Aug 2 13:29:02 2011 +0200 rt2x00: fix usage of NULL queue We may call rt2x00queue_pause_queue(queue) with queue == NULL. Bug was introduced by commit 62fe778412b36791b7897cfa139342906fbbf07b "rt2x00: Fix stuck queue in tx failure case" . Cc: stable@kernel.org # 3.0+ Signed-off-by: Stanislaw Gruszka Acked-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 449f94eadc91d69fa044fa92ef45c02e86559e13 Author: Helmut Schaa Date: Tue Aug 2 11:43:14 2011 +0200 rt2x00: Fix compilation without CONFIG_RT2X00_LIB_CRYPTO This was introduced by commit 77b5621bac4a56b83b9081f48d4e7d1accdde400 (rt2x00: Don't use queue entry as parameter when creating TX descriptor.) Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Reported-by: Randy Dunlap Acked-by: Randy Dunlap Signed-off-by: John W. Linville commit cc1a93e68f6c0d736b771f0746e8e4186f483fdc Author: Emmanuel Grumbach Date: Mon Aug 1 12:46:57 2011 -0700 iwlagn: sysfs couldn't find the priv pointer This bug has been introduced by: d593411084a56124aa9d80aafa15db8463b2d8f7 Author: Emmanuel Grumbach Date: Mon Jul 11 10:48:51 2011 +0300 iwlagn: simplify the bus architecture Revert part of the buggy patch: dev_get_drvdata will now return iwl_priv as it did before the patch. Signed-off-by: Emmanuel Grumbach Tested-by: Daniel Halperin Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit b52398b6e4522176dd125722c72c301015d24520 Author: Stanislaw Gruszka Date: Sat Jul 30 13:32:56 2011 +0200 rt2x00: rt2800: fix zeroing skb structure We should clear skb->data not skb itself. Bug was introduced by: commit 0b8004aa12d13ec750d102ba4082a95f0107c649 "rt2x00: Properly reserve room for descriptors in skbs". Cc: stable@kernel.org # 2.6.36+ Signed-off-by: Stanislaw Gruszka Acked-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit b6b67df3f24c45af0012ee3c8af2f62ca083ae18 Author: Larry Finger Date: Fri Jul 29 10:53:12 2011 -0500 rtlwifi: Fix kernel oops on ARM SOC This driver uses information from the self member of the pci_bus struct to get information regarding the bridge to which the PCIe device is attached. Unfortunately, this member is not established on all architectures, which leads to a kernel oops. Skipping the entire block that uses the self member to determine the bridge vendor will only affect RTL8192DE devices as that driver sets the ASPM support flag differently when the bridge vendor is Intel. If the self member is available, there is no functional change. This patch fixes Bugzilla No. 40212. Reported-by: Hubert Liao Signed-off-by: Larry Finger Cc: Stable [back to 2.6.38] Signed-off-by: John W. Linville commit d4930086bdd0c08a8b3a4d66a9c702297cb74a99 Author: Stanislaw Gruszka Date: Fri Jul 29 15:59:08 2011 +0200 ath9k: skip ->config_pci_powersave() if PCIe port has ASPM disabled We receive many bug reports about system hang during suspend/resume when ath9k driver is in use. Adrian Chadd remarked that this problem happens on systems that have ASPM disabled. To do not hit the bug, skip doing ->config_pci_powersave magic if PCIe downstream port device, which ath9k device is connected to, has ASPM disabled. Bug was introduced by: commit 53bc7aa08b48e5cd745f986731cc7dc24eef2a9f Author: Vivek Natarajan Date: Mon Apr 5 14:48:04 2010 +0530 ath9k: Add support for newer AR9285 chipsets. Patch should address: https://bugzilla.kernel.org/show_bug.cgi?id=37462 https://bugzilla.kernel.org/show_bug.cgi?id=37082 https://bugzilla.redhat.com/show_bug.cgi?id=697157 however I did not receive confirmation about that, except from Camilo Mesias, whose system stops hang regularly with this patch (but still hangs from time to time, but this is probably some other bug). Tested-by: Camilo Mesias Cc: stable@kernel.org # 2.6.35+ Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit 84404623da45aac04595a8f5760a58df0e955d87 Author: Dan Carpenter Date: Fri Jul 29 11:52:18 2011 +0300 cfg80211: off by one in nl80211_trigger_scan() The test is off by one so we'd read past the end of the wiphy->bands[] array on the next line. Signed-off-by: Dan Carpenter Signed-off-by: John W. Linville commit 17e859a899712d16c3e70b045d61ad9e02c53f8a Author: Stanislaw Gruszka Date: Wed Jul 27 15:37:43 2011 +0200 iwlegacy: set tx power after rxon_assoc If settings of tx power was deferred during scan or changing channel we have to setup them during commit rxon. Fix problem on 3945 (4965 already has this fix). Optimize code to apply tx settings only when tx power was actually changed. Cc: stable@kernel.org # 2.6.39+ Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit c1227340ca65c2069222a956a68b6842d460c4f4 Author: Felix Fietkau Date: Wed Jul 27 15:01:02 2011 +0200 ath9k: initialize tx chainmask before testing channel tx power values With an uninitialized chainmask, the per-channel power will only contain the power limits for a single chain instead of the combined tx power. Signed-off-by: Felix Fietkau Cc: stable@kernel.org Signed-off-by: John W. Linville commit f33c596a2f921696391801b637ed50d514634079 Merge: 250f8e3 74411c0 Author: Linus Torvalds Date: Sun Jul 31 06:23:08 2011 -1000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: smc91c92_cs.c: fix bogus compiler warning orinoco_cs: be more careful when matching cards with ID 0x0156:0x0002 hostap_cs: support cards with "Version 01.02" as third product ID pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3 pxa2xx pcmcia - stargate 2 use gpio array. pcmcia: pxa2xx: remove empty socket_init / socket_resume functions. drivers:pcmcia:soc_common: make socket_init and socket_suspend optional commit 49e58a932f6a35ad3d4888b5f66b27d4e20d990d Author: Pavel Roskin Date: Tue Jul 26 18:52:48 2011 -0400 orinoco_cs: be more careful when matching cards with ID 0x0156:0x0002 Without CONFIG_HERMES_PRISM, only match cards that have "Version 01.01" as the third product ID. Those have Agere firmware. With CONFIG_HERMES_PRISM, match all 0x0156:0x0002 cards. Signed-off-by: Pavel Roskin Signed-off-by: Dominik Brodowski commit 0a1013c76b52d8f8327f32498ea977d4b6662d45 Author: Pavel Roskin Date: Tue Jul 26 18:52:41 2011 -0400 hostap_cs: support cards with "Version 01.02" as third product ID Cards with numeric ID 0x0156:0x0002 and third ID "Version 01.02" can be assumed to have Intersil firmware. Cards with Agere firmware use "Version 01.01". Signed-off-by: Pavel Roskin Signed-off-by: Dominik Brodowski commit d5eab9152a3b4ce962c02ad0a0e4d0ec94aadd92 Merge: 6140333 a051294 Author: Linus Torvalds Date: Thu Jul 28 05:58:19 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (32 commits) tg3: Remove 5719 jumbo frames and TSO blocks tg3: Break larger frags into 4k chunks for 5719 tg3: Add tx BD budgeting code tg3: Consolidate code that calls tg3_tx_set_bd() tg3: Add partial fragment unmapping code tg3: Generalize tg3_skb_error_unmap() tg3: Remove short DMA check for 1st fragment tg3: Simplify tx bd assignments tg3: Reintroduce tg3_tx_ring_info ASIX: Use only 11 bits of header for data size ASIX: Simplify condition in rx_fixup() Fix cdc-phonet build bonding: reduce noise during init bonding: fix string comparison errors net: Audit drivers to identify those needing IFF_TX_SKB_SHARING cleared net: add IFF_SKB_TX_SHARED flag to priv_flags net: sock_sendmsg_nosec() is static forcedeth: fix vlans gianfar: fix bug caused by 87c288c6e9aa31720b72e2bc2d665e24e1653c3e gro: Only reset frag0 when skb can be pulled ... commit 550fd08c2cebad61c548def135f67aba284c6162 Author: Neil Horman Date: Tue Jul 26 06:05:38 2011 +0000 net: Audit drivers to identify those needing IFF_TX_SKB_SHARING cleared After the last patch, We are left in a state in which only drivers calling ether_setup have IFF_TX_SKB_SHARING set (we assume that drivers touching real hardware call ether_setup for their net_devices and don't hold any state in their skbs. There are a handful of drivers that violate this assumption of course, and need to be fixed up. This patch identifies those drivers, and marks them as not being able to support the safe transmission of skbs by clearning the IFF_TX_SKB_SHARING flag in priv_flags Signed-off-by: Neil Horman CC: Karsten Keil CC: "David S. Miller" CC: Jay Vosburgh CC: Andy Gospodarek CC: Patrick McHardy CC: Krzysztof Halasa CC: "John W. Linville" CC: Greg Kroah-Hartman CC: Marcel Holtmann CC: Johannes Berg Signed-off-by: David S. Miller commit b49179c071b89423e1f6c50f6fa3d48d8158bc35 Merge: 17dd759 e5036c2 Author: David S. Miller Date: Wed Jul 27 22:18:47 2011 -0700 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 60063497a95e716c9a689af3be2687d261f115b4 Author: Arun Sharma Date: Tue Jul 26 16:09:06 2011 -0700 atomic: use This allows us to move duplicated code in (atomic_inc_not_zero() for now) to Signed-off-by: Arun Sharma Reviewed-by: Eric Dumazet Cc: Ingo Molnar Cc: David Miller Cc: Eric Dumazet Acked-by: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5036c2575b244851637a81efc4104c076c4fa21 Merge: 41bf371 5bc91db Author: John W. Linville Date: Tue Jul 26 17:05:55 2011 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem commit 5bc91db8933bce07c3af86da2bd956414aa5a725 Author: Mihai Moldovan Date: Mon Jul 25 11:18:58 2011 +0200 wireless: fix a typo in ignore_reg_update Just a typo fix changing regulaotry to regulatory. Signed-off-by: Mihai Moldovan CC: John W. Linville CC: Mohammed Shafi Signed-off-by: John W. Linville commit e61b52d1309df08b86a35e54a61f0cc932b28291 Author: Pavel Roskin Date: Fri Jul 22 18:07:13 2011 -0400 b43: fix invalid memory access in b43_ssb_remove() wldev is freed in b43_one_core_detach() and should not be accessed after that call. Keep wldev->dev in a local variable. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 6f89062a66d8b88ca89a15a6cebc0bc0db284441 Author: Rafał Miłecki Date: Fri Jul 22 13:11:05 2011 +0200 b43: bcma: drop BROKEN We've fixed the last issue with BCMA support which caused memory corruption on loading and unloading b43. Support for BCMA in b43 was tested with 14e4:4353, 14e4:4357, 14e4:4727 and 14e4:4331. First two cards (BCM43224 and BCM43225) are supported. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit f76f424353e678f904c6c13f997851efb6077419 Author: Rafał Miłecki Date: Fri Jul 22 13:11:04 2011 +0200 b43: bus: fix memory corruption when setting driver's data Fixes bug described in: https://bugzilla.kernel.org/show_bug.cgi?id=39172 Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit a203c2aa4cefccb879c879b8e1cad1a09a679e55 Author: Sven Neumann Date: Tue Jul 12 15:52:07 2011 +0200 cfg80211: really ignore the regulatory request At the beginning of wiphy_update_regulatory() a check is performed whether the request is to be ignored. Then the request is sent to the driver nevertheless. This happens even if last_request points to NULL, leading to a crash in the driver: [] (lbs_set_11d_domain_info+0x28/0x1e4 [libertas]) from [] (wiphy_update_regulatory+0x4d0/0x4f4) [] (wiphy_update_regulatory+0x4d0/0x4f4) from [] (wiphy_register+0x354/0x420) [] (wiphy_register+0x354/0x420) from [] (lbs_cfg_register+0x80/0x164 [libertas]) [] (lbs_cfg_register+0x80/0x164 [libertas]) from [] (lbs_start_card+0x20/0x88 [libertas]) [] (lbs_start_card+0x20/0x88 [libertas]) from [] (if_sdio_probe+0x898/0x9c0 [libertas_sdio]) Fix this by returning early. Also remove the out: label as it is not any longer needed. Signed-off-by: Sven Neumann Cc: linux-wireless@vger.kernel.org Cc: Johannes Berg Cc: Daniel Mack Cc: stable@kernel.org Signed-off-by: John W. Linville commit d3ec4844d449cf7af9e749f73ba2052fb7b72fc2 Merge: 0003230 df2e301 Author: Linus Torvalds Date: Mon Jul 25 13:56:39 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits) fs: Merge split strings treewide: fix potentially dangerous trailing ';' in #defined values/expressions uwb: Fix misspelling of neighbourhood in comment net, netfilter: Remove redundant goto in ebt_ulog_packet trivial: don't touch files that are removed in the staging tree lib/vsprintf: replace link to Draft by final RFC number doc: Kconfig: `to be' -> `be' doc: Kconfig: Typo: square -> squared doc: Konfig: Documentation/power/{pm => apm-acpi}.txt drivers/net: static should be at beginning of declaration drivers/media: static should be at beginning of declaration drivers/i2c: static should be at beginning of declaration XTENSA: static should be at beginning of declaration SH: static should be at beginning of declaration MIPS: static should be at beginning of declaration ARM: static should be at beginning of declaration rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check Update my e-mail address PCIe ASPM: forcedly -> forcibly gma500: push through device driver tree ... Fix up trivial conflicts: - arch/arm/mach-ep93xx/dma-m2p.c (deleted) - drivers/gpio/gpio-ep93xx.c (renamed and context nearby) - drivers/net/r8169.c (just context changes) commit 262931339805ce8a7d25c5f75d5b2402013fc55d Author: David S. Miller Date: Sun Jul 24 13:09:32 2011 -0700 iwlwifi: Fix build with CONFIG_PM disabled. Signed-off-by: David S. Miller commit 41bf37117b47fc5ce2aae91f6a108e7e42e0b046 Merge: 415b333 6e6e8c5 Author: John W. Linville Date: Fri Jul 22 17:51:16 2011 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem commit 8c95b74d8d8acd8b0741b942a46fdb6f81d974ed Author: Rafał Miłecki Date: Fri Jul 22 00:25:00 2011 +0200 b43legacy: dma: cache translation (routing bits) Signed-off-by: Rafał Miłecki Tested-by: Larry Finger Signed-off-by: John W. Linville commit bb78c71d6c6947322a701580df7865409032dbf6 Author: Pavel Roskin Date: Thu Jul 21 13:36:42 2011 -0400 ath5k: use get_unaligned_le32() in ath5k_write_pwr_to_pdadc_table() Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit c5f3f45c4934d7e7dc266092debe88628d2cbb5d Author: Pavel Roskin Date: Thu Jul 21 13:36:35 2011 -0400 ath5k: remove ath5k_hw_get_capability(), don't use VEOL on AR5210 There are only two capabilities we need, and both are trivial to find. ath5k_hw_hasbssidmask() is true on AR5212, but not on AR5210 or AR5211. ath5k_hw_hasveol() is true on AR5211 and AR5212, but not on AR5210, according to the HAL source. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit fabba0480637add5411b1dc59603cc71e3505a69 Author: Pavel Roskin Date: Thu Jul 21 13:36:28 2011 -0400 ath5k: merge ath5k_{init, deinit}_hw() with their thin wrappers Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 24aad3f4c8a5c0a7514733fb9fa70994e24a5707 Author: Rafał Miłecki Date: Wed Jul 20 20:02:39 2011 +0200 b43: (un)initialize driver on the BCMA bus Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit eb90e9e85c36dd2dd730d2eacec74db84491033d Author: Rafał Miłecki Date: Wed Jul 20 19:52:16 2011 +0200 b43: bcma: get DMA translation bits Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit a9770a815d280d6aa2da406e159eff92b880670e Author: Rafał Miłecki Date: Wed Jul 20 19:52:14 2011 +0200 ssb: return correct translation bit for 64-bit DMA Remove b43's workarounds at the same time. Other users of ssb_dma_translation do not support any 64-bit DMA devices, so they are not affected. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 78c1ee7e61af4eb3f6c8a553ca56036e3734121f Author: Rafał Miłecki Date: Wed Jul 20 19:47:07 2011 +0200 b43: disable parity check on BCMA devices Analyze of MMIO dumps from BCM43224, BCM43225, BCM4313 and BCM4331 has shown that wl disables parity check for all that cards. This is required for receiving any packets from the hardware. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit dc437974af52e78f2736543dfee94cc385dae6e9 Author: Jiri Pirko Date: Wed Jul 20 04:54:34 2011 +0000 atl2: do vlan cleanup - unify vlan and nonvlan rx path - kill adapter->vlgrp and atl2_vlan_rx_register - allow to turn on/off rx/tx vlan accel via ethtool (set_features) Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 924917098e4bc3561a372a6eb36993e7c3bb02f2 Author: Jiri Pirko Date: Wed Jul 20 04:54:33 2011 +0000 atl1: do vlan cleanup - unify vlan and nonvlan rx path - kill adapter->vlgrp and atlx_vlan_rx_register - allow to turn on/off rx/tx vlan accel via ethtool (set_features) Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 2707fffc0f330662d75ff609470700100392673f Author: Jiri Pirko Date: Wed Jul 20 04:54:13 2011 +0000 atl1e: do vlan cleanup - unify vlan and nonvlan rx path - kill adapter->vlgrp and atl1e_vlan_rx_register - allow to turn on/off rx/tx vlan accel via ethtool (set_features) Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 46facce9130ee5a4e4863094049af85c4a757356 Author: Jiri Pirko Date: Wed Jul 20 04:54:12 2011 +0000 atl1c: do vlan cleanup - unify vlan and nonvlan rx path - kill adapter->vlgrp and atl1c_vlan_rx_register - allow to turn on/off rx/tx vlan accel via ethtool (set_features) Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 033b1142f4bd44a116d1356fe4a0510437ceddf9 Merge: f5caadb e6625fa Author: David S. Miller Date: Thu Jul 21 13:38:42 2011 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: net/bluetooth/l2cap_core.c commit 292b11926fec139c0ff103bc229bc6c079d0862f Author: Joe Perches Date: Wed Jul 20 08:51:35 2011 -0700 rtlwifi: Convert printks to pr_ Use the current logging styles. Add pr_fmt where appropriate. Remove now unnecessary prefixes from printks. Convert hard coded prefix to __func__. Add a missing "\n" to a format. Signed-off-by: Joe Perches Acked-by: Larry Finger Signed-off-by: John W. Linville commit 6054069a03f77ffa686e2dfd5f07cff8ee40b72d Author: Felix Fietkau Date: Tue Jul 19 08:46:44 2011 +0200 ath9k_hw: validate and fix broken eeprom chainmask settings Some devices (e.g. Ubiquiti AirRouter) ship with broken EEPROM chainmask data, which breaks the initial calibration after a hardware reset. To fix this, mask the eeprom chainmask with the chainmask of the chip, and use the chip chainmask if the result is zero. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit a0490936007bacf5bf6f4fb27788550c89c2c70d Author: Amitkumar Karwar Date: Wed Jul 13 20:51:59 2011 -0700 mwifiex: disable auto deep sleep before unloading the driver Since the auto deep sleep mode has been enabled at driver init time we should disable it at driver unloading to shutdown the function gracefully. Signed-off-by: Amitkumar Karwar Signed-off-by: Bing Zhao Signed-off-by: John W. Linville commit df3b124bdb6fe2459625443bd3dc0dbd020932da Author: Amitkumar Karwar Date: Wed Jul 13 20:51:58 2011 -0700 mwifiex: check SDIO multi-port aggregation buffer room correctly We should consider current packet length also while checking Tx aggregation buffer room. Signed-off-by: Amitkumar Karwar Signed-off-by: Yogesh Ashok Powar Signed-off-by: Bing Zhao Signed-off-by: John W. Linville commit 4e3c44207f90500f65a3858d344b4ff3c63ea765 Author: Amitkumar Karwar Date: Wed Jul 13 20:51:57 2011 -0700 mwifiex: put multicast/broadcast packets to the same RA For ad-hoc mode, RA is created for each peer connected. In case of multicast traffic new RA will be created for each multicast address. While processing Tx packets we have to go through this RA list. We can avoid some RA nodes by sharing same RA for both multicast and broadcast packets. Therefore "memset(0xff)" is used to treat multicast packet as broadcast one while choosing RA. Signed-off-by: Amitkumar Karwar Signed-off-by: Yogesh Ashok Powar Signed-off-by: Bing Zhao Signed-off-by: John W. Linville commit 1e89cbac16dd91f1ddbf53c68fecb85d42793841 Author: Emmanuel Grumbach Date: Wed Jul 20 17:51:22 2011 -0700 iwlagn: probe would crash with DEBUG_SHIRQ This is since my patch: iwlagn: introduce transport layer and implement rx_init The IRQ is requested before the locks are initialized, hence the crash. Initialize the tasklet before we request the IRQ on the way. Reported-by: Johannes Berg Tested-by: Johannes Berg Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit d62b39e105e427510f8996c03db9ce1bf83fcad8 Author: Wey-Yi Guy Date: Mon Jul 18 16:58:58 2011 -0700 iwlagn: remove "disable otp refresh" W/A Remove the "disable otp refresh" work-around, not needed anymore. Signed-off-by: Wey-Yi Guy commit e1b1c0875daa8ef396593270b5d3ec0b8483c1ea Author: Johannes Berg Date: Sun Jul 17 01:44:11 2011 -0700 iwlagn: rename iwlagn_set_dynamic_key We now have iwlagn_set_dynamic_key() and iwl_set_dynamic_key() which is confusing, rename the former to iwlagn_send_sta_key() to better reflect what it does -- it only sends a command and doesn't change driver state. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit bbb05cb55a1b57003b17d47b5a7ac809bab60f80 Author: Johannes Berg Date: Mon Jul 18 01:59:22 2011 -0700 iwlagn: track beacon interval sent to device Sometimes, when mac80211 changes the beacon interval or when it isn't yet set in mac80211 before association, the uCode will sysassert because we send it confusing RXON timing vs. PAN parameters. To fix this, track the last beacon interval sent to the device and use that in PAN parameter calculations. This fixes a bug during P2P group formation as a client (and possibly association to a regular AP) while connected to another AP. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 21489ec2f18b56eaebc70c0dae928c1adae4c5f5 Author: Wey-Yi Guy Date: Mon Jul 18 13:59:23 2011 -0700 iwlagn: write iq invert register for 105/135 device For 105/135 series of devices, we need to do I/Q invert just like 2000 series devices. Signed-off-by: Wey-Yi Guy commit c8ac61cf6e53fefb3b439fc58390fb65d2730e63 Author: Johannes Berg Date: Fri Jul 15 13:23:45 2011 -0700 iwlagn: implement WoWLAN Implement WoWLAN support in iwlagn. The device supports a number of wakeup triggers and can do GTK rekeying when asleep (if HW crypto is used). Unfortunately, we need to disconnect from the AP after resume since we can't yet get all the info out of the wowlan uCode to stay connected safely. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 5a3d9882b84edf5fa8e8ca33a5d6df25e2e727a5 Author: Johannes Berg Date: Fri Jul 15 13:03:12 2011 -0700 iwlagn: rewrite HW crypto As I just discovered while doing WoWLAN, HW crypto is done wrong for GTKs: they should be programmed for the AP station ID (in the managed mode case) and the HW can actually deal with multiple group keys per station as well (which is useful in IBSS RSN but that I've chosen not to use this). To fix all this, modify the way keys are sent to the device and key offsets are allocated. After these changes, key offsets are stored into the hw_key_idx which we can then track for the key lifetime, not relying on our sta_cmd array. WEP default keys get special treatment, of course. Additionally, since I had the API for it, we can now pre-fill TKIP phase 1 keys for RX now that we can obtain the P1K from mac80211, a capability I had added for WoWLAN initially. Finally, some keys simply don't need to be added into the device's key cache -- a key that won't be used for RX is only needed in the TX header, so "pretend" to have accepted any key without adding it into the device -- no need to use up key space there for it. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 0bfe9895d402faf03d5ccd30cc0e6bbad09e5bbc Author: Johannes Berg Date: Thu Jul 14 12:55:36 2011 -0700 iwlagn: remove forgotten debugfs function It seems that due to merge issues between different trees or so this function prototype wasn't removed when it should have been, do it now. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 898ed67be047d0762cc7592f67bf1313dff53ca9 Author: Wey-Yi Guy Date: Wed Jul 13 08:38:57 2011 -0700 iwlagn: remove un-necessary "_agn" After driver split, extra _agn in priv structure is no needed, remove it. Signed-off-by: Wey-Yi Guy commit a920bffb88260aac36bfd05745696dc6aa256627 Author: Johannes Berg Date: Wed Jul 13 13:27:25 2011 -0700 iwlagn: remove keyinfo cache iwlagn keeps a copy of key stuff internally but never actually uses it, so remove it. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit c10e2c102ff180998bf91404c2d76ca66ced46a0 Author: Wey-Yi Guy Date: Wed Jul 13 11:13:46 2011 -0700 iwlagn: testmode fixed rate available for testmode only Move tm_fixed_rate inside CONFIG_IWLWIFI_DEVICE_SVTOOL and only available when the option is enable. Signed-off-by: Wey-Yi Guy commit b09b296dddde0998e2019d2f355212642056253f Author: Emmanuel Grumbach Date: Mon Jul 11 13:14:37 2011 +0300 iwlagn: add comment to warn about WoWLAN in resume / suspend flows WoWLAN may need the NIC even after suspend. One should not do anything to the NIC in the bus level, since one cannot check whether WoWLAN is enabled or not. Same for resume. Add a simple comment to the code to warn about this. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit c1c81401de30448baf35ec2f689ad21faffb0536 Author: Emmanuel Grumbach Date: Mon Jul 11 11:18:48 2011 +0300 iwlagn: iwl_bus holds drv_data as void * instead of iwl_priv The price to pay is the access to the log system. Therefore logs from bus layer are sent by dev_printk instead of IWL_XXXX. Rename bus->priv to bus->drv_data to make the separation even clearer. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit d593411084a56124aa9d80aafa15db8463b2d8f7 Author: Emmanuel Grumbach Date: Mon Jul 11 10:48:51 2011 +0300 iwlagn: simplify the bus architecture Call iwl_probe with a ready iwl_bus struct. This means that the bus layer assigns the irq, dev and iwl_bus_ops pointers to iwl_bus before giving it to iwl_probe. The device specific struct is allocated together with the common iwl_bus struct by the bus specific layer. The pointer to the aggregate struct is passed to the upper layer that holds a pointer to iwl_bus instead of an embedded iw_bus. The private data given to the PCI subsystem is now iwl_bus and not iwl_priv. Provide bus_* inliners on the way in order to simplify the syntax. Rename iwl-pci.h -> iwl-bus.h since it is bus agnostic and represent the external of the bus layer. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 41c50542669cd7aec45ad708f5120ff8fdaa1194 Author: Emmanuel Grumbach Date: Mon Jul 11 08:51:04 2011 +0300 iwlagn: transport layer receives struct iwl_trans* It still holds a pointer to iwl_priv. But hopefully this will disappear at some point. Also add the multiple inclusion protection to iwl-trans.h that was forgotten. Move iwl-trans structures to iwl-trans.h Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 0286cee0d2b6357e8e30d817bbce8ff166f358b5 Author: Emmanuel Grumbach Date: Sun Jul 10 15:39:57 2011 +0300 iwlagn: move iwl_prepare_card_hw to the transport layer This function is really related to the transport layer - move it. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 392f8b789a4c96b39d527ff8ea5ceba20cd79d56 Author: Emmanuel Grumbach Date: Sun Jul 10 15:30:15 2011 +0300 iwlagn: move more functions from the start flow to the transport layer Basically all the nic_init flow should be in the transport layer. iwl_prepare_card_hw will move to the transport too in a separate patch. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 48d42c426947d8ffba0caa3cf9c58be6903302e0 Author: Emmanuel Grumbach Date: Sun Jul 10 10:47:01 2011 +0300 iwlagn: SCD configuration for AMPDU moves to transport layer All the configurations of the HW for AMPDU are now in the transport layer. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 2e27799621f9b6dc69d9fac5e365cb867eac539c Author: Wey-Yi Guy Date: Fri Jul 8 14:29:48 2011 -0700 iwlagn: radio sensor offset in le16 format For temperature offset calibration, send radio sensor offset in le16 format Signed-off-by: Wey-Yi Guy commit ad3f71244c93412087ae93aabce39c4a9fb12891 Author: Wey-Yi Guy Date: Fri Jul 8 14:29:47 2011 -0700 iwlagn: define valid init calibration mask Use the valid calibration mask for init calibration Signed-off-by: Wey-Yi Guy commit a21321c154f359a2254b76b1428017f51b96e379 Author: Wey-Yi Guy Date: Fri Jul 8 14:29:46 2011 -0700 iwlagn: remove legacy calibration command IWL_PHY_CALIBRATE_DIFF_GAIN_CMD is for legacy device, remove it Signed-off-by: Wey-Yi Guy commit df2a4dc802ad542039e0a78c84e8b0a562c6d8bb Author: Wey-Yi Guy Date: Fri Jul 8 14:29:45 2011 -0700 iwlagn: set correct calibration flag Set calibration config flag for complete notification Signed-off-by: Wey-Yi Guy commit 6bd4dba3d2b8a90d27dfd32b306fa965650599b4 Author: Emmanuel Grumbach Date: Sun Jul 3 15:45:34 2011 +0300 iwlagn: kill iwlagn_setup_deferred_work Since iwlagn_setup_deferred_work is always called, fold it into iwl_setup_deferred_work. BT related works are setup by the new bt_setup_deferred_work lib_ops. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 8d30119346d52516f289016e1c57f853a835cb4a Author: Emmanuel Grumbach Date: Sun Jul 3 15:45:34 2011 +0300 iwlagn: kill iwlagn_rx_handler_setup Since iwlagn_rx_handler_setup is always called, fold it into iwl_rx_handler_setup. BT related handlers are setup by the new bt_rx_handler_setup lib_ops. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 56d90f4c8ac186a708e6af290d23857ea901ba05 Author: Emmanuel Grumbach Date: Thu Jul 7 18:20:01 2011 +0300 iwlagn: add kick_nic API to transport layer kick_nic means to remove the RESET bit from the embedded CPU Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 497888cf69bf607ac1fe061a6437e0a670b0022f Author: Phil Carmody Date: Thu Jul 14 15:07:13 2011 +0300 treewide: fix potentially dangerous trailing ';' in #defined values/expressions All these are instances of #define NAME value; or #define NAME(params_opt) value; These of course fail to build when used in contexts like if(foo $OP NAME) while(bar $OP NAME) and may silently generate the wrong code in contexts such as foo = NAME + 1; /* foo = value; + 1; */ bar = NAME - 1; /* bar = value; - 1; */ baz = NAME & quux; /* baz = value; & quux; */ Reported on comp.lang.c, Message-ID: Initial analysis of the dangers provided by Keith Thompson in that thread. There are many more instances of more complicated macros having unnecessary trailing semicolons, but this pile seems to be all of the cases of simple values suffering from the problem. (Thus things that are likely to be found in one of the contexts above, more complicated ones aren't.) Signed-off-by: Phil Carmody Signed-off-by: Jiri Kosina commit d931998669c3e0e917bd9983880f3498c27de0af Author: Daniel Drake Date: Wed Jul 20 17:53:56 2011 +0100 libertas: only enable mesh when interface is active Previously, the mesh was running whenever the appropriate hardware and firmware was present. Now we only run the mesh when the interface is running. Also simplifies interface management a little. Signed-off-by: Daniel Drake Acked-by: Dan Williams Signed-off-by: John W. Linville commit 3db4f989384c90f5f6be14e88c19732bfb0ac331 Author: Daniel Drake Date: Wed Jul 20 17:53:50 2011 +0100 libertas: mesh: misc cleanup Remove unused blindlist code. Mark a few items const and static where possible. Involved some code re-ordering, but no code changes. Signed-off-by: Daniel Drake Acked-by: Dan Williams Signed-off-by: John W. Linville commit 037b559a167c76f3457582d1b84b4d1e36e38925 Author: Andy Shevchenko Date: Wed Jul 20 16:34:31 2011 +0300 wireless: mwifiex: print hw address via %pM Signed-off-by: Andy Shevchenko Cc: Bing Zhao Signed-off-by: John W. Linville commit 8f895026e8ef26419c38851a958c16286fffb43a Author: Andy Shevchenko Date: Wed Jul 20 16:34:30 2011 +0300 wireless: ath9k: use %pM to print MAC Signed-off-by: Andy Shevchenko Cc: "Luis R. Rodriguez" Cc: ath9k-devel@lists.ath9k.org Signed-off-by: John W. Linville commit 1d15b5f2d380186761d49588de27b2a6538afacb Author: Andy Shevchenko Date: Wed Jul 20 16:34:29 2011 +0300 wireless: rtlwifi: throw away MAC_FMT and use %pM instead Signed-off-by: Andy Shevchenko Cc: Larry Finger Signed-off-by: John W. Linville commit a401d2bb363d942245acdd81c5b5a754011696ee Author: Johannes Berg Date: Wed Jul 20 00:52:16 2011 +0200 cfg80211: fix scan crash on single-band cards commit 58389c69150e6032504dfcd3edca6b1975c8b5bc Author: Johannes Berg Date: Mon Jul 18 18:08:35 2011 +0200 cfg80211: allow userspace to control supported rates in scan made single-band cards crash since it would always access all wiphy->bands[]. Fix this and reject any attempts in the new helper ieee80211_get_ratemask() to do the same, rejecting rates configuration for unsupported bands. Reported-by: Pavel Roskin Tested-by: Pavel Roskin Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 70126f6105f86366fd97644937ef2180b906b7c8 Author: Pavel Roskin Date: Tue Jul 19 18:02:15 2011 -0400 carl9170: fix sparse warnings enabled by CONFIG_SPARSE_RCU_POINTER Signed-off-by: Pavel Roskin Acked-by: Christian Lamparter Signed-off-by: John W. Linville commit 0a557ed3a0a4f7e36d76da137b781344f548c464 Author: Eliad Peller Date: Tue Jul 19 13:14:42 2011 +0300 mac80211: check sta_info_get() return value ieee80211_stop_rx_ba_session() was calling sta_info_get() without rcu locking, and the return value was not checked. This resulted in the following panic: [] (ieee80211_stop_rx_ba_session+0x0/0x60 [mac80211]) [] (wl1271_event_handle+0x0/0xdc8 [wl12xx]) [] (wl1271_irq+0x0/0x4a0 [wl12xx]) [] (irq_thread+0x0/0x254) [] (kthread+0x0/0x8c) Signed-off-by: Eliad Peller Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit 5966f2ddcda452455f8ab518b7cba221b5234a94 Author: Eliad Peller Date: Tue Jul 19 12:57:13 2011 +0300 cfg80211: enter psm when working as p2p_cli cfg80211_netdev_notifier_call() is configuring psm in case of NL80211_IFTYPE_STATION interface type (on NETDEV_UP). do the same for NL80211_IFTYPE_P2P_CLIENT interface type. Signed-off-by: Eliad Peller Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit b2abb6e2bcb91ae384c5857dffd0bb97b76c7a68 Author: Johannes Berg Date: Tue Jul 19 10:39:53 2011 +0200 mac80211: sync driver before TX In P2P client mode, the GO (AP) to connect to might have periods of time where it is not available due to powersave. To allow the driver to sync with it and send frames to the GO only when it is available add a new callback tx_sync (and the corresponding finish_tx_sync). These callbacks can sleep unlike the actual TX. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit e0d687bd9df218ba3d97aac15919d30816d72dcb Author: Pavel Roskin Date: Thu Jul 14 20:21:55 2011 -0400 ath5k: merge ath5k_hw and ath5k_softc Both ath5k_hw and ath5k_softc represent one instance of the hardware. This duplication is historical and is not needed anymore. Keep the name "ath5k_hw" for the merged structure and "ah" for the variable pointing to it. "ath5k_hw" is shorter than "ath5k_softc", more descriptive and more widely used. Put the combined structure to ath5k.h where the old ath5k_softc used to be. Move some code from base.h to ath5k.h as needed. Remove memory allocation for struct ath5k_hw and the corresponding error handling. Merge iobase and ah_iobase fields. Signed-off-by: Pavel Roskin Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 491735929b63cb665b2215e3183b960e66f221f3 Author: Rafał Miłecki Date: Sun Jul 17 01:06:06 2011 +0200 b43: bcma: implement full core reset Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 2729df25550f041940f23c11ee8252094a6bd44b Author: Rafał Miłecki Date: Mon Jul 18 22:45:58 2011 +0200 b43: correctly display longer chipsets ids Some of the newer Broadcom chipsets have longe names like BCM43224, BCM43225, etc. However Broadcom decided to keep using u16 for storing them. Use %X or %d depending on chip_id value to avoid BCMA8D8, etc. Signed-off-by: Rafał Miłecki Acked-by: Pavel Roskin Signed-off-by: John W. Linville commit 85a237fe308405ee38eb9c6733571c49902ec229 Author: Johannes Berg Date: Mon Jul 18 18:08:36 2011 +0200 mac80211: implement scan supported rates Scanning currently uses the TX rate mask to restrict the rate set, which is bogus. Make it use the new set of rates from userspace. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 34850ab25d74ab4eead62c3b4a9e8036a25cc669 Author: Johannes Berg Date: Mon Jul 18 18:08:35 2011 +0200 cfg80211: allow userspace to control supported rates in scan Some P2P scans are not allowed to advertise 11b rates, but that is a rather special case so instead of having that, allow userspace to request the rate sets (per band) that are advertised in scan probe request frames. Since it's needed in two places now, factor out some common code parsing a rate array. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 0b5dd734d3545a9833c0bceeed5088ad9a1ca5e3 Author: Rafał Miłecki Date: Mon Jul 18 02:13:23 2011 +0200 b43: HT-PHY: fix masks in radio ctl Old masks were causing ugly, delayed lock ups. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 40c6226967c8b27eb21f6894abff1e145861c6e1 Author: Rafał Miłecki Date: Mon Jul 18 02:01:30 2011 +0200 b43: bcma: read info about supported bands Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 124cc1117569fbe23b2be1e01d76a01202a0ca93 Author: Rafał Miłecki Date: Mon Jul 18 02:01:29 2011 +0200 b43: bcma: define 80211 core specific IO status bits Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit b473bc176702cb22529632b5c4315bda27e0d979 Author: Rafał Miłecki Date: Sun Jul 17 10:30:34 2011 +0200 b43: HT-PHY: fix typo in 0x2059 radio init Following operation was incorrectly translated: radio_read(0x0011) -> 0xffff radio_write(0x0011) <- 0xfff7 Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 49ac26fa5b05cace123af9b069e00e47ab6a6fe7 Author: Rafał Miłecki Date: Sun Jul 17 10:30:33 2011 +0200 b43: HT-PHY: find channel entry with regs data Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 315a685f26ac220711d82bbf88cca6f55f1d9ca3 Author: Rafał Miłecki Date: Sun Jul 17 10:30:32 2011 +0200 b43: HT-PHY: switch to channel after enabling radio Also change the default channel to 11. This is the first channel closed driver switches to. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 36677874100edb610b22720f90859ee0f41330e2 Author: Rafał Miłecki Date: Sat Jul 16 18:27:55 2011 +0200 b43: use agent R/W ops for BCMA_IOCTL BCMA_IOCTL is register in agent (AKA wrapper) core, we need to use special R/W ops for it. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 02c5172c314308eb85f80899cc3aef41bc31bbad Author: Rajkumar Manoharan Date: Sun Jul 17 11:38:49 2011 +0530 ath9k: Fix some smatch warnings drivers/net/wireless/ath/ath9k/hif_usb.c +135 hif_usb_mgmt_cb(6) warn: variable dereferenced before check 'cmd' drivers/net/wireless/ath/ath9k/btcoex.c +77 ath9k_hw_init_btcoex_hw(38) error: buffer overflow 'ah->hw_gen_timers.gen_timer_index' 32 <= 2009813776 Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 5479de6e876e93d0037e43da7a8e7c2ed170b424 Author: Rajkumar Manoharan Date: Sun Jul 17 11:43:02 2011 +0530 ath9k: Fix sparse warnings drivers/net/wireless/ath/ath9k/init.c:199:21: warning: context imbalance in 'ath9k_reg_rmw' - different lock contexts for basic block drivers/net/wireless/ath/ath9k/xmit.c:1175:31: warning: context imbalance in 'ath_drain_txq_list' - unexpected unlock drivers/net/wireless/ath/ath9k/xmit.c:2047:23: warning: context imbalance in 'ath_tx_process_buffer' - unexpected unlock drivers/net/wireless/ath/ath9k/ar9003_eeprom.c:3041:24: warning: cast to restricted __le32 Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 0901edb758854e317fbc96774159739db4aff353 Author: Rafał Miłecki Date: Sun Jul 17 01:15:18 2011 +0200 b43: bus: drop inline from SSB functions We use all that functions by pointers only. This forces compiler to create additional duplicated functions that are not inline. Noticed by Michael in similar bcma code. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 582965672831180b2e1f5e15ea1f7dc6f5b93018 Author: Christian Lamparter Date: Sat Jul 16 17:30:19 2011 +0200 carl9170: set beacon xmit power to the max Harshal Chhaya discovered during network tests, that several of his clients dropped-off the network. The captured packets shows that the beacons sent by the AP are at a much lower power than the other data packets. The reason for this mishap: The driver never updated the beacon phy register, so all beacons were always sent at the lowest power. Reference: http://marc.info/?l=linux-wireless&m=131067225105801 Reported-by: Harshal Chhaya Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 943c33996f9b0851c4122dc96cae08d4ba8debf0 Author: Christian Lamparter Date: Sat Jul 16 17:25:14 2011 +0200 carl9170: move beacon_update into tx.c Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 43b52a5ae9b56c02fbf6e2d7de3c50ebf9ff7973 Author: Christian Lamparter Date: Sat Jul 16 17:21:01 2011 +0200 carl9170 firmware: update firmware headers * reserves feature bit for CCA counters * extends hardware register file definitions Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 21ec489d007b1873f86a379946938854b47df930 Author: Pavel Roskin Date: Fri Jul 15 19:06:46 2011 -0400 ath9k: use ath_opmode_to_string() Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 6c2c1ed8643b5c3bc331e3f61b3530d771abbdbe Author: Pavel Roskin Date: Fri Jul 15 19:06:40 2011 -0400 ath9k: remove defines in reg.h that exist in ../reg.h Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 78fa99abd7a7ecfd7364e7b7198c9ecc27766855 Author: Pavel Roskin Date: Fri Jul 15 19:06:33 2011 -0400 ath9k: use get_unaligned_{b16, le16, le32} where possible Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit d47d78dff4d6d72eec59dcdf0f6dd44064088112 Author: Pavel Roskin Date: Fri Jul 15 19:06:27 2011 -0400 ath: use get_unaligned_le{16,32} in ath_hw_keysetmac() Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 2683d65bb016a0533c25ead3025cbd24886cf35f Author: Eliad Peller Date: Thu Jul 14 20:29:42 2011 +0300 mac80211: reconfigure tx on device reconfiguration Add tx_conf array to save the current tx queues configuration, and reconfig it on resume (ieee80211_reconfig). On resume, the driver is being reconfigured. Without reconfiguring the tx queues as well, the driver might configure the device to use wrong ac params (e.g. ps-poll instead of uapsd). Signed-off-by: Eliad Peller Signed-off-by: John W. Linville commit b3c2ce131c7cd8c53b72b0cc04241cde17ce0c1d Author: Emmanuel Grumbach Date: Thu Jul 7 15:50:10 2011 +0300 iwlagn: add tx start API to transport layer tx start will start the tx queues: basically configure the SCD Remove the IWLAGN prefix to SCD defines on the way. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 1a361cd838173879672cb0f0ebe1e7654d7edff6 Author: Emmanuel Grumbach Date: Mon Jul 11 07:44:57 2011 -0700 iwlagn: move all the ICT related functions to iwl-trans-rx-pcie.c Since the ICT is transport related, move all its functions to the transport layer. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit ab6cf8e816bad473a1496f2006bea3a3849c2519 Author: Emmanuel Grumbach Date: Thu Jul 7 14:37:26 2011 +0300 iwlagn: move iwlagn_stop_device to transport layer Since iwlagn_stop_device was the only caller to the rx_stop / tx_stop, these two don't need to be API any more. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 253a634ccd1b291282cd0cade219bd90eb0371eb Author: Emmanuel Grumbach Date: Mon Jul 11 07:39:46 2011 -0700 iwlagn: move tx transport functions to iwl-trans-tx-pcie.c There are still a few functions here and there that should be put in the transport layer. Mainly the functions that are related to the reclaim flow. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit ab697a9f1e73ba817955e15bd899a8a0627f9fd6 Author: Emmanuel Grumbach Date: Mon Jul 11 07:35:34 2011 -0700 iwlagn: move rx transport functions to iwl-trans-rx-pcie.c Also create a new file: iwl-trans-int-pcie.h which will include the non static functions that are shared among the current pcie transport layer. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 4caab328eeea02b244765c355f9d875f8f5f6093 Author: Fry, Donald H Date: Thu Jul 7 15:24:07 2011 -0700 iwlagn: remove indirection for iwlagn_hw_valid_rtc_data_addr Not needed since the driver split. Signed-off-by: Don Fry Signed-off-by: Wey-Yi Guy commit 45d50024a766ef757f3ef7ca7d4f8fb38c5a79f0 Author: Wey-Yi Guy Date: Thu Jul 7 12:24:46 2011 -0700 iwlagn: calibration bitmap Define bitmap for calibration Signed-off-by: Wey-Yi Guy commit 6ff88a6414364d75ebd514d1efa11fbba603ac04 Author: Hsu, Kenny Date: Thu Jul 7 03:10:27 2011 -0700 iwlagn: set default of uCode ownership to driver The driver should take the ownership of the uCode as default setting for later operations after interface up. Signed-off-by: Kenny Hsu Signed-off-by: Wey-Yi Guy commit 2c2def10d03554c0f8ed02f5b5a2a8526958f6a3 Author: Johannes Berg Date: Thu Jul 7 05:11:51 2011 -0700 iwlagn: simplify TX flags assignments The first assignment of TX_CMD_FLG_SEQ_CTL_MSK for ack-expected mgmt frames is overwritten later in the function, so it's useless. Also, probe response frames, BACK request and others there are mutually exclusive so can be moved into an else branch. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 47365ab858a7f452e79437d1a44488245e903f37 Author: Emmanuel Grumbach Date: Thu Jul 7 09:25:51 2011 -0700 iwlagn: add comment to tx and get_tx_cmd in iwl_trans_ops Those comments were missed in a previous commit. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 7ed9af71684be2ee0366d0a30e8b0bda39126c3f Author: Wey-Yi Guy Date: Wed Jul 6 16:28:48 2011 -0700 iwlagn: comments for iwl_cfg Modify the comments for iwl_cfg, no functional changes Signed-off-by: Wey-Yi Guy commit e4305fe91f986aa3c56fbc18f0a8ecf05d65f26d Author: Wey-Yi Guy Date: Wed Jul 6 16:28:47 2011 -0700 iwlagn: another double indirect removed Another clean up work after driver split Signed-off-by: Wey-Yi Guy commit 90c300cbd89e76789dbff101a1cb1ec226af277f Author: Wey-Yi Guy Date: Thu Jul 7 08:33:01 2011 -0700 iwlagn: remove dual-indirect call to simply the code After driver split, no need to make the code so complex Signed-off-by: Wey-Yi Guy commit e505c433d35900d98870a2e266759166a03030dc Author: Wey-Yi Guy Date: Thu Jul 7 08:27:41 2011 -0700 iwlagn: remove un-necessary file Most of the functions in iwl-agn-hcmd are move to other files, no point to keep the file anymore. Signed-off-by: Wey-Yi Guy commit 1ab9f6c11b003d086ae4890ea202cc3c66f5a17a Author: Emmanuel Grumbach Date: Thu Jul 7 07:59:02 2011 -0700 iwlagn: move the Rx dispatching to the upper layer The upper layer receives a pointer to an iwl_rx_mem_buffer. I would prefer the upper layer to receive a pointer to an iwl_rx_packet, but this is impossible since the Rx path needs to add the address of the page to the skb. I may find a solution later. All the pre_rx_handler and notification code has been moved to the upper layer. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit a27367d25da06c24e0379ad4489542016ff11dbb Author: Emmanuel Grumbach Date: Mon Jul 4 09:06:44 2011 +0300 iwlagn: move sync_irq to transport layer Since all the irq / tasklet is now handled in the transport layer, it should give an API to ensure that all the irq / tasklet have finished running. This will allow the upper layer to release all its resources. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 34c1b7ba127d1815b3dd1cb81cc4338ce0e712b7 Author: Emmanuel Grumbach Date: Mon Jul 4 08:58:19 2011 +0300 iwlagn: move the tasklet / irq to the transport layer PCIe doesn't provide any ISR registration API, whereas other buses do. Hence, we need to move the tasklet and irq to the transport layer to allow this flexibility. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 47c1b496015e41e1068878814596af9a45d4fa84 Author: Emmanuel Grumbach Date: Sun Jul 3 11:22:15 2011 +0300 iwlagn: move Tx datapath to transport layer Split the Tx datapath in two parts: * the first deals with the Tx cmd composition * the second attaches the skb + Tx cmd to the queues Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 94f9b97be5b3bf67392e43fb7f567721b09142c2 Author: Johannes Berg Date: Thu Jul 14 16:48:54 2011 +0200 mac80211: be more careful in suspend/resume When suspending with all netdevs down, the device is stopped but we still call a number of driver callbacks that the driver might not expect. The same happens during resume, we might call a few callbacks without starting the driver. Fix this by checking open_count around more things and exiting quickly if it is 0. Also, while at this I noticed that the coverage class isn't reprogrammed after resume, so add that. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 3f29c522184ffb44fd475fdbe6083023ab1506f8 Author: Pavel Roskin Date: Wed Jul 13 21:38:18 2011 -0400 carl9170: fix formatting issues found by checkpatch Signed-off-by: Pavel Roskin Acked-By: christian Lamparter Signed-off-by: John W. Linville commit f850e00fcd7767d01101e2f0a6d464bee8e48b47 Author: Johannes Berg Date: Wed Jul 13 19:50:53 2011 +0200 mac80211: let key iteration get keys in install order ieee80211_iter_keys() currently returns keys in the backward order they were installed in, which is a bit confusing. Add them to the tail of the key list to make sure iterations go in the same order that keys were originally installed in. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 8bca5d815311f53ada13b62f5e590df40fef317e Author: Johannes Berg Date: Wed Jul 13 19:50:34 2011 +0200 mac80211: allow driver access to TKIP RX P1K When the driver wants to pre-program the TKIP RX phase 1 key, it needs to be able to obtain it for the peer's TA. Add API to allow it to generate it. The generation uses a dummy on-stack context since it doesn't know the RX queue. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 66760eac005d569393bac34136bcbb8af55d8a5a Author: Felix Fietkau Date: Wed Jul 13 23:35:05 2011 +0800 ath9k: improve reliability of MIC error detection For unicast the hardware sometimes reports MIC errors even though the frame that it received actually contains a valid MIC - on some chips this can happen frequently enough to trigger TKIP countermeasures. Fix this issue by not reporting MIC errors for unicast frames with a valid key, letting mac80211 validate the MIC instead. Additionally, strip the MIC for all frames that the hardware considers valid to avoid wasting CPU cycles re-validating it. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 933d594313a5928ffc5325d7bbb6e2383d79622e Author: Pavel Roskin Date: Wed Jul 13 11:19:57 2011 -0400 orinoco: minor fixes for problems found by checkpatch.pl Eliminate spaces before tabs. Eliminate typedefs. Add spaces around operators. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 16c929df0895e6f52f4a0f17683d709f5fef95d8 Author: Yogesh Ashok Powar Date: Wed Jul 13 17:42:06 2011 +0530 mwl8k: Fixing sta dereference when ieee80211_tx_info->control.sta is NULL Following oops was seen on SMP machine >BUG: unable to handle kernel NULL pointer dereference at 00000012 >IP: [] mwl8k_tx+0x20e/0x561 [mwl8k] >*pde = 00000000 >Oops: 0000 [#1] SMP >Modules linked in: mwl8k mac80211 cfg80211 [last unloaded: cfg80211] As ieee80211_tx_info->control.sta may be NULL during ->tx call, avoiding sta dereference in such scenario with the following patch. Signed-off-by: Yogesh Ashok Powar Signed-off-by: John W. Linville commit 5a865bad44984de245d20bfb7cff99993e8e8294 Author: Luciano Coelho Date: Wed Jul 13 14:57:29 2011 +0300 nl80211/cfg80211: add max_sched_scan_ie_len in the hw description Some chips may support different lengths of user-supplied IEs with a single scheduled scan command than with a single normal scan command. To support this, this patch creates a separate hardware description element that describes the maximum size of user-supplied information element data supported in scheduled scans. Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 93b6aa693a355932b69c96956596b03f91baec35 Author: Luciano Coelho Date: Wed Jul 13 14:57:28 2011 +0300 nl80211/cfg80211: add max_sched_scan_ssids in the hw description Some chips can scan more SSIDs with a single scheduled scan command than with a single normal scan command (eg. wl12xx chips). To support this, this patch creates a separate hardware description element that describes the amount of SSIDs supported in scheduled scans. Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 77dbbb138986b26cb99f868d4b6410577ef4c040 Author: Johannes Berg Date: Wed Jul 13 10:48:55 2011 +0200 nl80211: advertise GTK rekey support, new triggers Since we now have the necessary API in place to support GTK rekeying, applications will need to know whether it is supported by a device. Add a pseudo-trigger that is used only to advertise that capability. Also, add some new triggers that match what iwlagn devices can do. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 95a943c162d74b20d869917bdf5df11293c35b63 Merge: ecae42d 95acac6 Author: John W. Linville Date: Fri Jul 15 10:05:24 2011 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem Conflicts: net/bluetooth/l2cap_core.c commit 6a7ebdf2fd15417e87b4fd02ff411aeaca34da5f Merge: f6b72b6 51414d4 Author: David S. Miller Date: Thu Jul 14 07:56:40 2011 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: net/bluetooth/l2cap_core.c commit 95acac61ba66c4abd40e038dae8c1ed2e176c7b1 Author: Johannes Berg Date: Tue Jul 12 12:30:59 2011 +0200 mac80211: allow driver to disconnect after resume In WoWLAN, devices may use crypto keys for TX/RX and could also implement GTK rekeying. If the driver isn't able to retrieve replay counters and similar information from the device upon resume, or if the device isn't responsive due to platform issues, it isn't safe to keep the connection up as GTK rekey messages from during the sleep time could be replayed against it. The only protection against that is disconnecting from the AP. Modifying mac80211 to do that while it is resuming would be very complex and invasive in the case that the driver requires a reconfig, so do it after it has resumed completely. In that case, however, packets might be replayed since it can then only happen after TX/RX are up again, so mark keys for interfaces that need to disconnect as "tainted" and drop all packets that are sent or received with those keys. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 2fcf282471f04f465d0368e46e973e01504292b3 Author: Mohammed Shafi Shajakhan Date: Tue Jul 12 15:19:04 2011 +0530 mac80211: remove a redundant check is_valid_ether_addr itself checks for is_zero_ether_addr Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 5d82c53a380ca96421a714481c9113ba54ede609 Author: Yogesh Ashok Powar Date: Mon Jul 11 20:04:44 2011 -0700 mwifiex: add cfg80211 handler for set_bitrate_mask Currently, setting only legacy bitrates on 2.4GHz band are supported. Mode 802.11b/g/bg is enabled based on bitrates selection. If only CCK bitrates selected then 802.11b mode is enabled. If only OFDM bitrates are selected then 802.11g mode is enabled. For both: CCK and OFDM rates 802.11bg mixed mode is enabled. Signed-off-by: Yogesh Ashok Powar Signed-off-by: Bing Zhao Signed-off-by: John W. Linville commit 4e868796bbcbae2f2ea3a828c803686787392b71 Author: Felix Fietkau Date: Tue Jul 12 09:02:05 2011 +0800 ath5k: do not call ieee80211_stop_queue for queues not managed by mac80211 Instead of using ieee80211_stop_queue, check the configured tx queue limit before calling ieee80211_get_buffered_bc. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 6340211c5f4775a52c98052fb5661565f79249fd Author: Felix Fietkau Date: Tue Jul 12 09:02:04 2011 +0800 ath5k: disable 32KHz sleep clock operation by default While 32 KHz sleep clock might provide some power saving benefits, it is also a major source of stability issues, on OpenWrt it produced some reproducible data bus errors on register accesses on several different MIPS platforms. All the Atheros drivers that I can find do not enable this feature, so it makes sense to leave it disabled in ath5k as well. Signed-off-by: Felix Fietkau Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit f00643888ca435ce6934482243733cc140281d10 Author: Felix Fietkau Date: Tue Jul 12 09:02:03 2011 +0800 ath5k: fix reference clock usec duration setting restore enabling the sleep clock alters the AR5K_USEC_32 field, but disabling it didn't restore it. Signed-off-by: Felix Fietkau Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit fe00deb3e4b50eede61cc7d4ab9bce7911f0a074 Author: Felix Fietkau Date: Tue Jul 12 09:02:02 2011 +0800 ath5k: delay full calibration after reset During scans the full calibration usually does not make much sense, PAPD probing and IQ calibration should be deferred until there is enough time to complete them. Adding 100 ms to the initial full calibration delay should be enough to do this. Signed-off-by: Felix Fietkau Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 26d16d23e621cdc679118ca2fe604752b3a36e9f Author: Felix Fietkau Date: Tue Jul 12 09:02:01 2011 +0800 ath5k: initialize common->clockrate Fixes a division by zero when setting distance before activating the device for the first time. Signed-off-by: Felix Fietkau Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 2d2cf471d51743c631f216f62a02a62b58126191 Author: Felix Fietkau Date: Tue Jul 12 09:02:00 2011 +0800 ath5k: fix reference clock frequency for spur mitigation on AR2413 AR2413 uses the same reference clock as AR5413 Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit ca8bfd94bbe5bd89ff6a4bbf5a050251950cce25 Author: Felix Fietkau Date: Tue Jul 12 09:01:59 2011 +0800 ath5k: apply the synth voltage tweak only on AR5112 rev 2 Might fix some stability issues on newer chips Signed-off-by: Felix Fietkau Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit b613c7262dda30563bb1759573e39392a81524e6 Author: Felix Fietkau Date: Tue Jul 12 09:01:58 2011 +0800 ath5k: add missing checks for rfgain probe rfgain probe is only necessary for OFDM operation on AR5111 and AR5112. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 0472ade031b5c0c69c21cf96acf64c50eb9ba3c2 Author: Senthil Balasubramanian Date: Tue Jul 12 00:02:56 2011 +0530 ath9k_hw: Fix incorrect key_miss handling Decryping frames on key_miss handling shouldn't be done for Michael MIC failed frames as h/w would have already decrypted such frames successfully anyway. Also leaving CRC and PHY error(where the frame is going to be dropped anyway), we are left to prcoess Decrypt error for which s/w decrypt is selected anway and so having key_miss as a separate check doesn't serve anything. So making key_miss handling mutually exlusive with other RX status handling makes much more sense. This patch addresses an issue with STA not reporting MIC failure events resulting in STA being disconnected immediately. Cc: stable@kernel.org Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit 2a897d41a30b0af2dbc61c18aa3d2edd9b80fe6a Author: Joe Perches Date: Fri Jul 8 23:20:25 2011 -0700 iwlagn: Add missing comma between constant string array Multiple quoted strings are concatenated without comma separators. Make the array const while there. Signed-off-by: Joe Perches Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 861d9c3f25d216ccbec71a45280eff17fb912434 Author: Joe Perches Date: Fri Jul 8 23:20:24 2011 -0700 iwlegacy: Add missing comma between constant string array Multiple quoted strings are concatenated without comma separators. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit a67792789868d95d14e46a7b6e0c1f214a6fcfb1 Author: Wey-Yi Guy Date: Mon Jul 11 10:47:39 2011 -0700 iwlagn: fix warning in testmode attribute table Fix the compile warning cause by [IWL_TM_ATTR_MAX - 1] Reported-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 9dff387046ef20547236b75dd0d095904e4c0779 Author: Mohammed Shafi Shajakhan Date: Mon Jul 11 20:14:14 2011 +0530 ath9k: remove an unnecessary function declaration Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 43bf8c245237b8309153aa39d4e8f1586cf56af0 Author: Eduardo Bacchi Kienetz Date: Sun Jul 10 17:05:14 2011 +0200 rt2800usb: Add new device ID for Belkin Belkin's Connect N150 Wireless USB Adapter, model F7D1101 version 2, uses ID 0x945b. Chipset info: rt: 3390, rf: 000b, rev: 3213. I have just bought one, which started to work perfectly after the ID was added through this patch. Signed-off-by: Eduardo Bacchi Kienetz Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 3ffca4fc404f056ecd79e57515dd7c2670db1fbf Author: Joe Perches Date: Sun Jul 10 02:28:26 2011 -0700 ath5k: Add missing breaks in switch/case Signed-off-by: Joe Perches Acked-by: Pavel Roskin Signed-off-by: John W. Linville commit 1288aa4e80145d9f4196df32f717b4c1cf6aab61 Author: Larry Finger Date: Sat Jul 9 13:15:58 2011 -0500 rtlwifi: rtl8192cu: Fix duplicate if test A typo causes routine rtl92cu_phy_rf6052_set_cck_txpower() to test the same condition twice. The problem was found using cppcheck-1.49, and the proper fix was verified against the pre-mac80211 version of the code. Reported-by: David Binderman Signed-off-by: Larry Finger Cc: stable [back to 2.6.39] Signed-off-by: John W. Linville commit df90d84382b03faf81637db31b6be14f477482c7 Author: Daniel Drake Date: Sat Jul 9 15:41:25 2011 +0100 libertas: fix handling of command timeout, completion and interruption When commands time out, corruption ensues. As lbs_complete_command() is called without locking, the command node is mistakenly freed twice. Also fixed up locking here in a few other places. The nature of command timeout may be that the card didn't even acknowledge receipt of the request. Detect this case and reset dnld_sent so that other commands don't hang forever. When cmdnodes are moved between the free list and the pending list, their list heads should be reinitialized. Fixed this. Sometimes commands are completed without actually submitting them or removing them from cmdpendingq. We must remember to remove them from cmdpendingq in these cases, so handle this in lbs_complete_command(). Harmless signals generated during suspend/resume were interrupting lbs_cmd. Convert to an uninterruptible sleep to avoid this. lbs_thread must be woken up every time there is some new work to do. I found that when 2 commands are queued, ther completion of the first command would not wake up lbs_thread to submit the second. Poke lbs_thread at the end of lbs_complete_command() to fix this. Signed-off-by: Daniel Drake Signed-off-by: John W. Linville commit 55d990592f83cbfabfefde6e32bf27d4e7493d0c Author: Johannes Berg Date: Sat Jul 9 15:39:16 2011 +0200 mac80211: allocate only one RX queue We don't have multiple RX queues, so there's no use in allocating multiple, use alloc_netdev_mqs() to allocate multiple TX but only one RX queue. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit af71ff85047b744d37872491f485f7a1e0677990 Author: Johannes Berg Date: Sat Jul 9 14:48:30 2011 +0200 cfg80211: fix docbook Looks like I forgot to document the "gfp" parameter to cfg80211_gtk_rekey_notify, add it. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit edcc3604805b37344d0569b61a34dbe22943ba9f Author: Olivier Sobrie Date: Sat Jul 9 12:57:05 2011 +0200 libertas: fix errors in functions accessing module registers Problems located in the two functions lbs_set_reg() and lbs_get_reg(): - The offset field of struct cmd_ds_reg_access was not filled in - The test on the return code of lbs_cmd_with_response() in function lbs_get_reg() was inverted Signed-off-by: Olivier Sobrie Signed-off-by: John W. Linville commit 6a2a0e738225fc9ec063f84b79f0adf5c0ed176c Author: Pavel Roskin Date: Sat Jul 9 00:17:51 2011 -0400 ath5k: fix typos, bad comment formatting and GHz in place of MHz Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 86fbe17d7f0856f4111e1ceaf3f5c399315fb4e7 Author: Pavel Roskin Date: Sat Jul 9 00:17:45 2011 -0400 ath5k: validate mode in ath5k_ani_init() before trying to set it Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 21394754bcca59aeb4a0b74c95c0220bb727808f Author: Felix Fietkau Date: Sat Jul 9 11:12:54 2011 +0700 ath9k_hw: add a missing delay for an analog register AR_AN_SYNTH9 is in the analog shift register range and thus needs to be written using the ath9k_hw_analog_shift_rmw function. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 7d865c7080b3cb9d95eaf7d40343712e582fc3e7 Author: Felix Fietkau Date: Sat Jul 9 11:12:53 2011 +0700 ath9k_hw: fix synth delay for half/quarter channels The radio needs twice / four times as much time to stabilize for half/quarter channels. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 0407cf1c7f0fdbecab7efbd8214ac2d1196a67f9 Author: Felix Fietkau Date: Sat Jul 9 11:12:52 2011 +0700 ath9k_hw: set 5 GHz half/quarter channels on AR9002 using fractional mode The radio seems to perform better that way Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit fe2b6afbce05abe90d31651d3b92c88e0abc5ecb Author: Felix Fietkau Date: Sat Jul 9 11:12:51 2011 +0700 ath9k_hw: remove ar9287 v1.3+ specific hardcoded register hacks Now that the clock rate is initialized properly and SIFS, EIFS, USEC, slot time and ACK timeout are properly calculated by the generic code, the 'async FIFO' register hacks are no longer necessary. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit b6ba41bb27eb9810d54e2301355ce56fd0e94a1a Author: Felix Fietkau Date: Sat Jul 9 11:12:50 2011 +0700 ath9k_hw: initialize more timing related registers for half/quarter channels Initialize the the clock-to-TSF field of AR_USEC and the SIFS and EIFS time registers based on the clock rate instead of relying on initvals. With those changes, some of the hardcoded AR9287 1.3+ specific overrides can be dropped. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 087b6ff682ff62c49c9a36ddfd24fc781367b1d1 Author: Felix Fietkau Date: Sat Jul 9 11:12:49 2011 +0700 ath9k_hw: fix MAC clock rate for AR9287 v1.3+ This chip uses the async FIFO feature and runs the MAC at 117 MHz Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 906c720527b23ba8c99683ea5f9ea1f9d7749e8c Author: Felix Fietkau Date: Sat Jul 9 11:12:48 2011 +0700 ath9k_hw: fix MAC clock for half/quarter rate Enabling half/quarter rate makes the MAC run at half/quarter clock speed. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit a949b1725c38775fb869d24433f13d2d104de145 Author: Felix Fietkau Date: Sat Jul 9 11:12:47 2011 +0700 ath9k_hw: always enable 5 GHz fast clock for AR9280 All devices support this, but some disable it using an EEPROM flag for some reason. Improves 5 GHz performance on those devices. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 804f6acb7cea1ea5b3e0ded1bf037f9bf02f1124 Author: Felix Fietkau Date: Sat Jul 9 11:12:46 2011 +0700 ath9k_hw: remove hardcoded PLL overrides for AR9280 Use the proper masks for the register instead. Fixes adding the (still unused) half/quarter PLL flags. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit cd27bc3c3efb95ee20e5b627c483eb9513cd0350 Author: Amitkumar Karwar Date: Fri Jul 8 20:40:30 2011 -0700 mwifiex: 11n specific configuration for transmit Currently device is not able to transmit in 40MHz in spite of enabling 40MHz support in HTCapInfo IE in assoc req, because 11n specific FW capabilities for transmission are not initialized. This patch adds code to initilize these capabilities. Signed-off-by: Amitkumar Karwar Signed-off-by: Yogesh Ashok Powar Signed-off-by: Kiran Divekar Signed-off-by: Bing Zhao Signed-off-by: John W. Linville commit 5c3d29fc0d083e674c09407f1bc78e9dbf4ae8a5 Author: Don Fry Date: Fri Jul 8 08:46:29 2011 -0700 iwlagn: remove iwlagn_hcmd_utils structure and call directly Not needed since the driver split. Move single use routines to calling location and keep static where possible. Signed-off-by: Don Fry Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 4e308119771573f949203f9f4732bcbfb9628279 Author: Wey-Yi Guy Date: Fri Jul 8 08:46:28 2011 -0700 iwlagn: separate and enhance the fixed rate from For testing purpose, we need better control of msc from user application. Separate the fixed_rate between debugfs and testmode and enforce it. Signed-off-by: Kenny Hsu Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit eedb6e357a4b1bd3d7e4544e77fbd71718492547 Author: Wey-Yi Guy Date: Fri Jul 8 08:46:27 2011 -0700 iwlagn: block regular host commands if driver don't own uCode The only host command allow to send to uCode is the one initiated from testmode if testmode is the owner of uCode Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit e98a1939a2d75354631487328339fe8d2117fce9 Author: Wey-Yi Guy Date: Fri Jul 8 08:46:26 2011 -0700 iwlagn: allow application own the uCode operation Since we open the door to allow application control the device behavior through testmode, add command to allow application request the ownership of the uCode Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit c7c1115b8ff485d3a48b70bb7135776a696778ad Author: Wey-Yi Guy Date: Fri Jul 8 08:46:25 2011 -0700 iwlagn: add CMD_ON_DEMAND flag for host command from testmode For all the hist command request from testmode, set the CMD_ON_DEMAND flag. this flag will be used later to control the uCode behavior Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 3a3b14c26cd285b4f4700bf10ea634bbbe73eac6 Author: Wey-Yi Guy Date: Fri Jul 8 08:46:24 2011 -0700 iwlagn: declare static Declare iwl_mac_rssi_callback as "static" Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 207ecc5eab908843449c167f7264a35d7d5d5e0b Author: Meenakshi Venkataraman Date: Fri Jul 8 08:46:23 2011 -0700 iwlagn: Enable/disable PS poll based on RSSI and BT coex traffic state WiFi throughput drops drastically when BT is turned on, BT and WiFi are simultaneously transmitting/receiving traffic. This is particularly true when BT has higher priority over WiFi, and hence the device defers TX frames. The AP assumes that the channel is bad and reduces the data rate, implying longer airtime, which exacerbates the problem further, resulting ultimately in what is popularly called the "death-spiral" phenomenon. The use of PS-poll in such scenarios guarantees a low but consistent throughput. Since the death-spiral phenomenon is observed only when the RSSI is low, use PS-poll only when RSSI is low and disable when high, with a known hysterisis. This feature specifies the high and low thresholds and implements the callbacks registered with mac80211, which will be called when threshold events occur. iwlwifi: dynamic pspoll: optimize rssi monitor code Signed-off-by: Meenakshi Venkataraman Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 615f7b9bb1f8e0e3188470245cec44f175189084 Author: Meenakshi Venkataraman Date: Fri Jul 8 08:46:22 2011 -0700 mac80211: add driver RSSI threshold events mac80211 maintains a running average of the RSSI when a STA is associated to an AP. Report threshold events to any driver that has registered callbacks for getting RSSI measurements. Implement callbacks in mac80211 so that driver can set thresholds. Add callbacks in mac80211 which is invoked when an RSSI threshold event occurs. mac80211: add tracing to rssi_reports api and remove extraneous fn argument mac80211: scale up rssi thresholds from driver by 16 before storing Signed-off-by: Meenakshi Venkataraman Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 0a49b2c2a6bf2f774675e472afe68951900596fb Author: Wey-Yi Guy Date: Fri Jul 8 08:46:21 2011 -0700 iwlagn: use bt handler for 2030 and 135 series devices For bt combo devices, need to use bt enabled handlers and functions Reported-by: Don Fry Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 909fc3cba374560ada33a7dc3ab242d0f1d2a135 Author: Wey-Yi Guy Date: Fri Jul 8 08:46:20 2011 -0700 iwlagn: remove double level temperature indirect call No need to do double level indirect call after driver split no functional changes Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 70e3e8a6e831bf58a7eb98187c186221f01d5b64 Author: Fry, Donald H Date: Fri Jul 8 08:46:19 2011 -0700 iwlagn: remove indirection for eeprom_query_addr Not needed since the driver split. Eliminate redundant routine. Signed-off-by: Don Fry Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit e4c598b7ce36f4416f7672617265bc1fa92e5a5f Author: Fry, Donald H Date: Fri Jul 8 08:46:18 2011 -0700 iwlagn: remove the indirection for iwl_apm_init Not needed since the driver split. Signed-off-by: Don Fry Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 6b6db91c8aa14fa9bd041321026d69b9f6ea42ff Author: Fry, Donald H Date: Fri Jul 8 08:46:17 2011 -0700 iwlagn: remove the indirection for update_chain_flags Not needed since the driver split. Signed-off-by: Don Fry Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit bdfbf0924ab05e02d28e50bd2d5024097642a78d Author: Emmanuel Grumbach Date: Fri Jul 8 08:46:16 2011 -0700 iwlagn: provide heplers to access the transport ops This removes the for priv->trans.ops->... Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 02f6f659b0080e60021aae3503163576f88c5ba8 Author: Wey-Yi Guy Date: Fri Jul 8 08:46:15 2011 -0700 iwlagn: remove the indirection for the dma channel num Not needed since the driver split. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit e419d62d72b23392e7f9a5da047fb17d70edc54a Author: Emmanuel Grumbach Date: Fri Jul 8 08:46:14 2011 -0700 iwlagn: consolidate the API that sends host commands and move to transport Now, there are only two functions to send a host command: * send_cmd that receives a iwl_host_cmd * send_cmd_pdu that builds the iwl_host_cmd itself and received flags The flags CMD_ASYNC / CMD_SYNC / CMD_WANT_SKB are not changed by the API functions. Kill the unused flags CMD_SIZE_NORMAL / CMD_NO_SKB on the way. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 06f491ef4b659fa6f6850f31d05a4a03db0d9d96 Author: Emmanuel Grumbach Date: Fri Jul 8 08:46:13 2011 -0700 iwlagn: remove code duplication Code duplication was needed during the move, not needed any more. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit c170b867cc119fb9f6e9cac3a8245a3347bc718c Author: Emmanuel Grumbach Date: Fri Jul 8 08:46:12 2011 -0700 iwlagn: add an API for TX stop Tx stop moves to transport layer. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit c2c52e8bed1a186d060166ec57228e2a123cab2e Author: Emmanuel Grumbach Date: Fri Jul 8 08:46:11 2011 -0700 iwlagn: add an API for RX stop Rx stop moves to transport layer. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 1359ca4f305a1680ea6a1347a43bea76c352097c Author: Emmanuel Grumbach Date: Fri Jul 8 08:46:10 2011 -0700 iwlagn: add an API to free the TX context Tx free functions move to the transport layer. Unify the functions that deal with tx queues and cmd queue. Since the CMD queue is not fully allocated, but uses the q->n_bd / q->window trick, the release flow of TX queue and CMD queue was different. iwlagn_txq_free_tfd receives now the index of the TFD to be freed, which allows to unify the release flow for all the queues. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit afaf6b5742f85bab46232faae97fdd1493061173 Author: Emmanuel Grumbach Date: Fri Jul 8 08:46:09 2011 -0700 iwlagn: remove the CMD_MAPPED flag It is uneeded since Johannes removed the HUGE flag. The DMA mapping is always held in the same index as the command. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 4b42c542afbc119c4012324ea80e0c5a89afea4f Merge: d859898 e2fd318 Author: John W. Linville Date: Mon Jul 11 14:58:22 2011 -0400 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6 Conflicts: net/bluetooth/l2cap_core.c commit d8598981146241064993e371cea8333f59553cb6 Merge: 8ae2e12 3445951 Author: John W. Linville Date: Mon Jul 11 14:46:59 2011 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/net/wireless/ath/ath5k/sysfs.c net/bluetooth/l2cap_core.c net/mac80211/wpa.c commit b7e9c223be8ce335e30f2cf6ba588e6a4092275c Merge: c172d82 e3bbfa7 Author: Jiri Kosina Date: Mon Jul 11 14:15:48 2011 +0200 Merge branch 'master' into for-next Sync with Linus' tree to be able to apply pending patches that are based on newer code already present upstream. commit e2fd318e3a9208245ee1041f6d413c8593fba29d Author: Ilia Kolomisnky Date: Sun Jul 10 08:47:44 2011 +0300 Bluetooth: Fixes l2cap "command reject" reply according to spec There can 3 reasons for the "command reject" reply produced by the stack. Each such reply should be accompanied by the relevand data ( as defined in spec. ). Currently there is one instance of "command reject" reply with reason "invalid cid" wich is fixed. Also, added clean-up definitions related to the "command reject" replies. Signed-off-by: Ilia Kolomisnky Signed-off-by: Gustavo F. Padovan commit 8f360119243c214eb5c5549c61981d51a276154a Author: Vinicius Costa Gomes Date: Fri Jul 8 18:31:46 2011 -0300 Bluetooth: Add support for returning the encryption key size This will be useful when userspace wants to restrict some kinds of operations based on the length of the key size used to encrypt the link. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit 726b4ffcaa450d9593b9b6ac8605967ce9f3e506 Author: Vinicius Costa Gomes Date: Fri Jul 8 18:31:45 2011 -0300 Bluetooth: Add support for storing the key size In some cases it will be useful having the key size used for encrypting the link. For example, some profiles may restrict some operations depending on the key length. The key size is stored in the key that is passed to userspace using the pin_length field in the key structure. For now this field is only valid for LE controllers. 3.0+HS controllers define the Read Encryption Key Size command, this field is intended for storing the value returned by that command. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit 5a0a8b49746771fba79866fb9185ffa051a6a183 Author: Vinicius Costa Gomes Date: Fri Jul 8 18:31:44 2011 -0300 Bluetooth: Add support for communicating keys with userspace As the key format has changed to something that has a dynamic size, the way that keys are received and sent must be changed. The structure fields order is changed to make the parsing of the information received from the Management Interface easier. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit 0eb08e339836989557ea3aa4c427377bd32ce19c Author: Vinicius Costa Gomes Date: Thu Jul 7 18:59:42 2011 -0300 Bluetooth: Remove unused field in hci_conn Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit 02bc74556a3f1b26adf3feb372376c56ba990564 Author: Vinicius Costa Gomes Date: Thu Jul 7 18:59:41 2011 -0300 Bluetooth: Use the stored LTK for restabilishing security Now that it's possible that the exchanged key is present in the link key list, we may be able to estabilish security with an already existing key, without need to perform any SMP procedure. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit e7e62c8592484f79469312fc694d2995918aa152 Author: Vinicius Costa Gomes Date: Thu Jul 7 18:59:40 2011 -0300 Bluetooth: Use the link key list to temporarily store the STK With this we can use only one place to store all keys, without need to use a field in the connection structure for this purpose. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit 16b908396fbf1be49d417ffdb4a8b41c8c8cb670 Author: Vinicius Costa Gomes Date: Thu Jul 7 18:59:39 2011 -0300 Bluetooth: Add support for storing the LTK Now when the LTK is received from the remote or generated it is stored, so it can later be used. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit 54790f73a3ec87c181e4d6e5eb6963de3d50ebd7 Author: Vinicius Costa Gomes Date: Thu Jul 7 18:59:38 2011 -0300 Bluetooth: Fix SM pairing parameters negotiation Before implementing SM key distribution, the pairing features exchange must be better negotiated, taking into account some features of the host and connection requirements. If we are in the "not pairable" state, it makes no sense to exchange any key. This allows for simplification of the key negociation method. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit bea710feff617e3469789dd8f930b284c83a87f5 Author: Vinicius Costa Gomes Date: Thu Jul 7 18:59:37 2011 -0300 Bluetooth: Reject an encryption request when the key isn't found Now that we have methods to finding keys by its parameters we can reject an encryption request if the key isn't found. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit 75d262c2ad927751bb5f096f3a6a37d81e7784f2 Author: Vinicius Costa Gomes Date: Thu Jul 7 18:59:36 2011 -0300 Bluetooth: Add functions to manipulate the link key list for SMP As the LTK (the new type of key being handled now) has more data associated with it, we need to store this extra data and retrieve the keys based on that data. Methods for searching for a key and for adding a new LTK are introduced here. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit d8bf4ca9ca9576548628344c9725edd3786e90b1 Author: Michal Hocko Date: Fri Jul 8 14:39:41 2011 +0200 rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check Since ca5ecddf (rcu: define __rcu address space modifier for sparse) rcu_dereference_check use rcu_read_lock_held as a part of condition automatically so callers do not have to do that as well. Signed-off-by: Michal Hocko Acked-by: Paul E. McKenney Signed-off-by: Jiri Kosina commit 7034b911af1aa571995b56db3ed71a25daf00373 Author: Vinicius Costa Gomes Date: Thu Jul 7 18:59:34 2011 -0300 Bluetooth: Add support for SMP phase 3 (key distribution) This adds support for generating and distributing all the keys specified in the third phase of SMP. This will make possible to re-establish secure connections, resolve private addresses and sign commands. For now, the values generated are random. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit 8ae2e12f1534e647d4a816755e5a09c2de6f9fca Author: Rajkumar Manoharan Date: Fri Jul 8 18:12:03 2011 +0530 ath9k_htc: Inform stack about tx ack status Recent firmware changes report tx ack status properly to driver. Hence updating ath9k_htc driver capabilities. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 1fa1238e50385707b8e9fea97d16252c931448d8 Author: Rajkumar Manoharan Date: Fri Jul 8 18:12:02 2011 +0530 ath9k_hw: Remove read-only registers from AR9003 intervals This patch removes read only registers that cause invalid address access and also updates index for measurement filter calibration window size. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 43d9325b2477b556ac1cc95cf15f40cbd4100e5d Author: Rajkumar Manoharan Date: Fri Jul 8 18:12:01 2011 +0530 ath9k_hw: Disable power detector calibration for AR9003 The power detector calibration is disabled because this block doesn't exist in AR9003 based chips and also parallel calibration is enabled otherwise the calibration will never stop. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 6fea2b15cc166e8e8851083395c17314c7bd874a Author: Rajkumar Manoharan Date: Fri Jul 8 18:12:00 2011 +0530 ath9k_hw: Update AR9003 interval to improve 5G Tx EVM The number of temperature reading samples to average during a Tx packet is decreased to 1 from 2 to improve 5G Tx EVM with chain 0-only mode. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 1a84ff7564ae43dd1ea20e17f867de2700ca5b5b Author: Luciano Coelho Date: Fri Jul 8 11:16:16 2011 +0300 cfg80211: return -ENOENT when stopping sched_scan while not running If we try to stop a scheduled scan while it is not running, we should return -ENOENT instead of simply ignoring the command and returning success. This is more consistent with other parts of the code. Reported-by: Johannes Berg Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 331c5ea2d92c76bfe58a9bb5e6d21160850a29bc Author: Mohammed Shafi Shajakhan Date: Fri Jul 8 13:01:32 2011 +0530 ath9k_hw: Disable PAPRD based on paprd_ht20_mask for 5GHz Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit e156103cee78a1dd1c0d14efe08aa36fc9285013 Author: Yogesh Ashok Powar Date: Thu Jul 7 17:37:09 2011 -0700 mwifiex: 4-byte alignment in mwifiex_process_sta_txpd() In XMIT path, the skb that we get from the kernel itself is not aligned with 4-byte boundary on some embedded platforms. Had it not been the presence of tx_pkt_offset field in txpd, 4 byte memory alignment was not possible without memmove of entire skb. And that would have increased MIPS instead of reducing. With this patch few memory cycles can be saved while fetching interface header and txpd structure because of 4 bytes memory alignment. Reported-by: Philip Rakity Signed-off-by: Yogesh Ashok Powar Tested-by: Philip Rakity Signed-off-by: Bing Zhao Signed-off-by: John W. Linville commit 38869d79e5b498bd35c9967231dfb01cdd301bf5 Author: Amitkumar Karwar Date: Thu Jul 7 17:33:20 2011 -0700 mwifiex: fix minor issue in debugfs command 'info' Debugfs command 'info' shows wrong interface type. The regression occurred due to commit eecd8250e (mwifiex: remove MWIFIEX_BSS_MODE_ macros) in which we replaced MWIFIEX_BSS_MODE_* macros by NL80211_IFTYPE_*, for example, MWIFIEX_BSS_MODE_IBSS (2) --> NL80211_IFTYPE_ADHOC (1) The issue is fixed by swapping static character array used to display interface type information. Signed-off-by: Amitkumar Karwar Signed-off-by: Bing Zhao Signed-off-by: John W. Linville commit e6faada5daddcdf29056c8abee0869d4e2cd55b5 Author: Amitkumar Karwar Date: Thu Jul 7 17:33:19 2011 -0700 mwifiex: fix regression in WEP security mode Htcapinfo is unnecessarily sent in assoc request in WEP security due to a regression introduced by commit 2be50b8df53 (mwifiex: remove redundant encryption_mode mapping). The issue is fixed in this patch. Signed-off-by: Amitkumar Karwar Signed-off-by: Bing Zhao Signed-off-by: John W. Linville commit 4fc5401c144d95b031e839ba3208e04c79ac84cb Author: Pavel Roskin Date: Thu Jul 7 18:14:25 2011 -0400 ath5k: read sc->imask with sc->irqlock held Signed-off-by: Pavel Roskin sc->imask may change if ath5k_set_current_imask() races against itself. Signed-off-by: John W. Linville commit e2df64c1d767eb52a5c617668e20745d5e3015c8 Author: Pavel Roskin Date: Thu Jul 7 18:14:19 2011 -0400 ath5k: use kstrtoint() to parse numbers coming from sysfs Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit e4bbf2f541501dcde47ce687ffc6d238bd2f7813 Author: Pavel Roskin Date: Thu Jul 7 18:14:13 2011 -0400 ath5k: fix formatting errors found by checkpatch.pl Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit d2c7f7730e5660c812765acd57516f709ea35fc0 Author: Pavel Roskin Date: Thu Jul 7 18:14:07 2011 -0400 ath5k: fix misplaced or extraneous braces found by checkpatch.pl Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 633d006ee6a7229f1d2c60924084d902d60c0e5f Author: Pavel Roskin Date: Thu Jul 7 18:14:01 2011 -0400 ath5k: use parentheses around macro definitions Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 2753f87a574c4844dfa1709c7d0a474f0dc8d818 Author: Pavel Roskin Date: Thu Jul 7 18:13:55 2011 -0400 ath5k: don't use volatile, it's not needed Signed-off-by: Pavel Roskin The reg variable is only used by __raw_writel() and __raw_readl(), which should guarantee memory access in the right order. Signed-off-by: John W. Linville commit 2724a74a2620f98bd63e866e54938d092a017b21 Author: Pavel Roskin Date: Thu Jul 7 18:13:48 2011 -0400 ath5k: use more readable way to clear MAC address Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 25380d8068dbe983c929f5d10ae18647082511d8 Author: Pavel Roskin Date: Thu Jul 7 18:13:42 2011 -0400 ath5k: use DEFINE_PCI_DEVICE_TABLE in led.c, mark users with __devinit Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit ef82763d8dad6b2312ce388fd9af23dd2b4626d4 Author: Pavel Roskin Date: Thu Jul 7 18:13:36 2011 -0400 ath5k: use KERN_WARNING in ATH5K_PRINTF Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit fdd55d14b7d3a721e60fdc8be12ec0beb9cda8c6 Author: Pavel Roskin Date: Thu Jul 7 18:13:30 2011 -0400 ath5k: remove unneeded parentheses after return Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 0a5d381348fcb12d27289b3a66824fb3481911ce Author: Pavel Roskin Date: Thu Jul 7 18:13:24 2011 -0400 ath5k: replace spaces with tabs as suggested by checkpatch.pl Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit b988a887a448be479696544de31656754c133f30 Author: Pavel Roskin Date: Thu Jul 7 18:13:17 2011 -0400 ath5k: remove PRIV_ENTRY and PRIV_ASSIGN macros, they obfuscate the code Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 69f7235fe69be5c644f934566f3b972988e71ee4 Author: Christian Lamparter Date: Thu Jul 7 23:01:25 2011 +0200 carl9170: Implement tx_frames_pending mac80211 callback function Implementing this callback function will cause mac80211 refrain from going to powersave state when there are still untransmitted TX frames in the queues. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit cae561473e87fd01b07d980c643acd51c07e1f64 Author: Sebastian Andrzej Siewior Date: Thu Jul 7 21:58:10 2011 +0200 net/b43: don't return IRQ_HANDLED if nothing was done Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: John W. Linville commit 21a18f284b00f977b355a2901d0ca6dae929b370 Author: Rafał Miłecki Date: Thu Jul 7 20:06:56 2011 +0200 b43: HT-PHY: define dummy TX power functions Without them we get Oops with NULL pointer Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 676b58c27475a9defccc025fea1cbd2b141ee539 Author: Rajkumar Manoharan Date: Thu Jul 7 23:33:39 2011 +0530 mac80211: Restart STA timers only on associated state A panic was observed when the device is failed to resume properly, and there are no running interfaces. ieee80211_reconfig tries to restart STA timers on unassociated state. Cc: stable@kernel.org Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 565dfefbe196206bc1e40bf92e7c5d53e9d9f706 Author: Rajkumar Manoharan Date: Thu Jul 7 23:33:38 2011 +0530 ath9k_htc: do not configure filter before driver is started Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 58eb7ff3dc056c6935c1cedee365ccf554000f45 Author: Rafał Miłecki Date: Thu Jul 7 18:58:25 2011 +0200 b43: LCN-PHY: include new PHY in common code Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 8b9bda759e5b7c042c2b3ae852aaa332c0ee4495 Author: Rafał Miłecki Date: Thu Jul 7 18:58:24 2011 +0200 b43: define firmwares for HT and LCN PHYs We were uploading different firmwares to the hardware until finding responding one. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 42d98795505314c7af42c7c6b988425300958ed3 Author: Johannes Berg Date: Thu Jul 7 18:58:01 2011 +0200 mac80211: allow driver to generate P1K for IV32 In order to support pre-populating the P1K cache in iwlwifi hardware for WoWLAN, we need to calculate the P1K for the current IV32. Allow drivers to get the P1K for any given IV32 instead of for a given packet, but keep the packet-based version around as an inline. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 3ea542d3c2862142ae511fac5ce2dfc7419dcc53 Author: Johannes Berg Date: Thu Jul 7 18:58:00 2011 +0200 mac80211: allow drivers to access key sequence counter In order to implement GTK rekeying, the device needs to be able to encrypt frames with the right PN/IV and check the PN/IV in RX frames. To be able to tell it about all those counters, we need to be able to get them from mac80211, this adds the required API. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 9e26297a56453315ae6829aec609b5a6309af7b4 Author: Johannes Berg Date: Thu Jul 7 18:45:03 2011 +0200 mac80211: simplify RX PN/IV handling The current rx->queue value is slightly confusing. It is set to 16 on non-QoS frames, including data, and then used for sequence number and PN/IV checks. Until recently, we had a TKIP IV checking bug that had been introduced in 2008 to fix a seqno issue. Before that, we always used TID 0 for checking the PN or IV on non-QoS packets. Go back to the old status for PN/IV checks using the TID 0 counter for non-QoS by splitting up the rx->queue value into "seqno_idx" and "security_idx" in order to avoid confusion in the future. They each have special rules on the value used for non- QoS data frames. Since the handling is now unified, also revert the special TKIP handling from my patch "mac80211: fix TKIP replay vulnerability". Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 1d738e64f3d957d56c1b51e64ebdef986a8760e3 Author: Rafał Miłecki Date: Thu Jul 7 15:25:27 2011 +0200 b43: LCN-PHY add place for new PHY support LCN-PHY was found in 14e4:4727 card. It uses LCN/1 and 0x2064/1 radio. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 0cd20a278e1ef9da9f6a987942794c9d65af8c4d Author: Johannes Berg Date: Wed Jul 6 22:02:14 2011 +0200 mac80211: use AES_BLOCK_SIZE mac80211 has a defnition of AES_BLOCK_SIZE and multiple definitions of AES_BLOCK_LEN. Remove them all and use crypto/aes.h. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 544e5d8bcd7ab305494e57cfa388b2d06a43c520 Author: Rafał Miłecki Date: Wed Jul 6 20:27:25 2011 +0200 b43: read radio ID on new cores Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 3fd48508d0d3d8e5423cab6b52a3b818085b6245 Author: Rafał Miłecki Date: Wed Jul 6 20:27:24 2011 +0200 b43: use radio ID reading code to older cores only Newer ones need separated way Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 8c8b964c20adb79a7deb58dc9d55754b0ca1233c Author: Rafał Miłecki Date: Wed Jul 6 18:05:14 2011 +0200 b43: select BLOCKIO for BCMA We want PIO as fallback for BCMA as well. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 6ff1e5cf70abbe04b261b4ccd9696e1ab6785086 Author: Rafał Miłecki Date: Wed Jul 6 17:41:55 2011 +0200 b43: change selecting ucode for newer cores Older cores had unique PHY. This is not true anymore for newer ones. For example core rev 16 can be LP, SSLPN or N (PHY). Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 74abacb6b5b91141eb8963faa2f22b3f1bd7c68d Author: Rafał Miłecki Date: Wed Jul 6 15:45:28 2011 +0200 b43: bus: add helpers for getting/setting wldev from/in bus core Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 42c9a458965da2b74e772054fdc4bcdec0351da8 Author: Rafał Miłecki Date: Wed Jul 6 15:45:27 2011 +0200 b43: handle BCMA in bus switches Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 6cbab0d9139246405b2449ffebecc8c48d927a6e Author: Rafał Miłecki Date: Wed Jul 6 15:45:26 2011 +0200 b43: use switches for SSB specific code Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 75396ae6d433b49482e377e6f8dbf1f42ad53f3a Author: Johannes Berg Date: Wed Jul 6 22:00:35 2011 +0200 mac80211: fix CMAC races Just like TKIP and CCMP, CMAC has the PN race. It might not actually be possible to hit it now since there aren't multiple ACs for management frames, but fix it anyway. Also move scratch buffers onto the stack. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit aba83a0b301c32dbb91c017f33307611e1a1d384 Author: Johannes Berg Date: Wed Jul 6 21:59:39 2011 +0200 mac80211: fix CCMP races Since we can process multiple packets at the same time for different ACs, but the PN is allocated from a single counter, we need to use an atomic value there. Use atomic64_t to make this cheaper on 64-bit platforms, other platforms will support this through software emulation, see lib/atomic64.c. We also need to use an on-stack scratch buf so that multiple packets won't corrupt each others scratch buffers. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 523b02ea23b175dd3e46e3daf1bc9354376640a3 Author: Johannes Berg Date: Thu Jul 7 22:28:01 2011 +0200 mac80211: fix TKIP races, make API easier to use Our current TKIP code races against itself on TX since we can process multiple packets at the same time on different ACs, but they all share the TX context for TKIP. This can lead to bad IVs etc. Also, the crypto offload helper code just obtains the P1K/P2K from the cache, and can update it as well, but there's no guarantee that packets are really processed in order. To fix these issues, first introduce a spinlock that will protect the IV16/IV32 values in the TX context. This first step makes sure that we don't assign the same IV multiple times or get confused in other ways. Secondly, change the way the P1K cache works. I add a field "p1k_iv32" that stores the value of the IV32 when the P1K was last recomputed, and if different from the last time, then a new P1K is recomputed. This can cause the P1K computation to flip back and forth if packets are processed out of order. All this also happens under the new spinlock. Finally, because there are argument differences, split up the ieee80211_get_tkip_key() API into ieee80211_get_tkip_p1k() and ieee80211_get_tkip_p2k() and give them the correct arguments. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 397915c30731340ee3f348d1be597b22467acbdf Author: Rafał Miłecki Date: Wed Jul 6 19:03:46 2011 +0200 b43: implement BCMA bus ops Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d1507051bf6004c8ff0cf823fc5e115fc0a740b3 Author: Rafał Miłecki Date: Tue Jul 5 23:54:07 2011 +0200 b43: make b43_wireless_init bus generic Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit e441a5eab928ddee8a946b4d48489341b41f88f2 Merge: 5f0dd29 f1a4638 Author: John W. Linville Date: Fri Jul 8 11:05:20 2011 -0400 Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx commit 204d1641d200709c759d8c269458cbc7de378c40 Merge: 31817df 5f0dd29 Author: John W. Linville Date: Fri Jul 8 11:03:36 2011 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem commit f1a46384ad568f72c11edbe2a3ec284bf32f2dbd Author: Arik Nemtsov Date: Thu Jul 7 14:25:23 2011 +0300 wl12xx: start/stop queues according to global per-AC counters Split tx_queue_count to count per-AC skb's queued, instead of relying on the skb-queue len. The skb queues used were only valid in STA-mode, as AP-mode uses per-link queues. This fixes a major regression in AP-mode, caused by the patch "wl12xx: implement Tx watermarks per AC". With that patch applied, we effectively had no regulation of Tx queues in AP-mode. Therefore a sustained high rate of Tx could cause exhaustion of the skb memory pool. Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit fadd192e81b0a8d8086531b8c11bd88b311b68c2 Author: Mat Martineau Date: Thu Jul 7 09:39:03 2011 -0700 Bluetooth: Remove L2CAP busy queue The ERTM receive buffer is now handled in a way that does not require the busy queue and the associated polling code. Signed-off-by: Mat Martineau Signed-off-by: Gustavo F. Padovan commit e328140fdacbba43292a59a22fb55d9185288318 Author: Mat Martineau Date: Thu Jul 7 09:39:02 2011 -0700 Bluetooth: Use event-driven approach for handling ERTM receive buffer This change moves most L2CAP ERTM receive buffer handling out of the L2CAP core and in to the socket code. It's up to the higher layer (the socket code, in this case) to tell the core when its buffer is full or has space available. The recv op should always accept incoming ERTM data or else the connection will go down. Within the socket layer, an skb that does not fit in the socket receive buffer will be temporarily stored. When the socket is read from, that skb will be placed in the receive buffer if possible. Once adequate buffer space becomes available, the L2CAP core is informed and the ERTM local busy state is cleared. Receive buffer management for non-ERTM modes is unchanged. Signed-off-by: Mat Martineau Signed-off-by: Gustavo F. Padovan commit 26f880d221302b5d061185d8a6795bb532693bf3 Author: Mat Martineau Date: Thu Jul 7 09:39:01 2011 -0700 Bluetooth: Move code for ERTM local busy state to separate functions The local busy state is entered and exited based on buffer status in the socket layer (or other upper layer). This change is in preparation for general buffer status reports from the socket layer, which will then be used to change the local busy status. Signed-off-by: Mat Martineau Signed-off-by: Gustavo F. Padovan commit 8c156c322f8a300afe59259bd554db166cf88203 Author: Andre Guedes Date: Thu Jul 7 10:30:36 2011 -0300 Bluetooth: Fix potential deadlock in mgmt All threads running in process context should disable local bottom halve before locking hdev->lock. This patch fix the following message generated when Bluetooh module is loaded with enable_mgmt=y (CONFIG_PROVE_LOCKING enabled). [ 107.880781] ================================= [ 107.881631] [ INFO: inconsistent lock state ] [ 107.881631] 2.6.39+ #1 [ 107.881631] --------------------------------- [ 107.881631] inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage. [ 107.881631] rcuc0/7 [HC0[0]:SC1[3]:HE1:SE0] takes: [ 107.881631] (&(&hdev->lock)->rlock){+.?...}, at: [] mgmt_set_local_name_complete+0x84/0x10b [bluetooth] [ 107.881631] {SOFTIRQ-ON-W} state was registered at: [ 107.881631] [] __lock_acquire+0x347/0xd52 [ 107.881631] [] lock_acquire+0x8a/0xa7 [ 107.881631] [] _raw_spin_lock+0x2c/0x3b [ 107.881631] [] mgmt_control+0xd4d/0x175b [bluetooth] [ 107.881631] [] hci_sock_sendmsg+0x97/0x293 [bluetooth] [ 107.881631] [] sock_aio_write+0x126/0x13a [ 107.881631] [] do_sync_write+0xba/0xfa [ 107.881631] [] vfs_write+0xaa/0xca [ 107.881631] [] sys_write+0x45/0x69 [ 107.881631] [] system_call_fastpath+0x16/0x1b [ 107.881631] irq event stamp: 2100876 [ 107.881631] hardirqs last enabled at (2100876): [] restore_args+0x0/0x30 [ 107.881631] hardirqs last disabled at (2100875): [] save_args+0x6a/0x70 [ 107.881631] softirqs last enabled at (2100862): [] rcu_cpu_kthread+0x2b5/0x2e2 [ 107.881631] softirqs last disabled at (2100863): [] call_softirq+0x1c/0x26 [ 107.881631] [ 107.881631] other info that might help us debug this: [ 107.881631] Possible unsafe locking scenario: [ 107.881631] [ 107.881631] CPU0 [ 107.881631] ---- [ 107.881631] lock(&(&hdev->lock)->rlock); [ 107.881631] [ 107.881631] lock(&(&hdev->lock)->rlock); [ 107.881631] [ 107.881631] *** DEADLOCK *** [ 107.881631] [ 107.881631] 1 lock held by rcuc0/7: [ 107.881631] #0: (hci_task_lock){++.-..}, at: [] hci_rx_task+0x49/0x2f3 [bluetooth] [ 107.881631] [ 107.881631] stack backtrace: [ 107.881631] Pid: 7, comm: rcuc0 Not tainted 2.6.39+ #1 [ 107.881631] Call Trace: [ 107.881631] [] print_usage_bug+0x1e7/0x1f8 [ 107.881631] [] ? save_stack_trace+0x27/0x44 [ 107.881631] [] ? print_irq_inversion_bug.part.26+0x19a/0x19a [ 107.881631] [] mark_lock+0x106/0x258 [ 107.881631] [] __lock_acquire+0x2d3/0xd52 [ 107.881631] [] ? vprintk+0x3ab/0x3d7 [ 107.881631] [] lock_acquire+0x8a/0xa7 [ 107.881631] [] ? mgmt_set_local_name_complete+0x84/0x10b [bluetooth] [ 107.881631] [] ? lock_release+0x16c/0x179 [ 107.881631] [] _raw_spin_lock_bh+0x31/0x40 [ 107.881631] [] ? mgmt_set_local_name_complete+0x84/0x10b [bluetooth] [ 107.881631] [] mgmt_set_local_name_complete+0x84/0x10b [bluetooth] [ 107.881631] [] hci_event_packet+0x122b/0x3e12 [bluetooth] [ 107.881631] [] ? mark_held_locks+0x4b/0x6d [ 107.881631] [] ? _raw_spin_unlock_irqrestore+0x40/0x4d [ 107.881631] [] ? trace_hardirqs_on_caller+0x13f/0x172 [ 107.881631] [] ? _raw_spin_unlock_irqrestore+0x48/0x4d [ 107.881631] [] hci_rx_task+0xc8/0x2f3 [bluetooth] [ 107.881631] [] ? __local_bh_enable+0x90/0xa4 [ 107.881631] [] tasklet_action+0x87/0xe6 [ 107.881631] [] __do_softirq+0x9f/0x13f [ 107.881631] [] call_softirq+0x1c/0x26 [ 107.881631] [] ? do_softirq+0x46/0x9a [ 107.881631] [] ? rcu_cpu_kthread+0x2b5/0x2e2 [ 107.881631] [] _local_bh_enable_ip+0xac/0xc9 [ 107.881631] [] local_bh_enable+0xd/0xf [ 107.881631] [] rcu_cpu_kthread+0x2b5/0x2e2 [ 107.881631] [] ? __init_waitqueue_head+0x46/0x46 [ 107.881631] [] ? rcu_yield.constprop.42+0x98/0x98 [ 107.881631] [] kthread+0x7f/0x87 [ 107.881631] [] kernel_thread_helper+0x4/0x10 [ 107.881631] [] ? retint_restore_args+0x13/0x13 [ 107.881631] [] ? __init_kthread_worker+0x53/0x53 [ 107.881631] [] ? gs_change+0x13/0x13 Signed-off-by: Andre Guedes Signed-off-by: Gustavo F. Padovan commit 8aded7110a5625bc00aef05e94dd4b1a9cf3605f Author: Andre Guedes Date: Thu Jul 7 10:30:35 2011 -0300 Bluetooth: Fix potential deadlock in hci_core Since hdev->lock may be acquired by threads runnning in interrupt context, all threads running in process context should disable local bottom halve before locking hdev->lock. This can be done by using hci_dev_lock_bh macro. This way, we avoid potencial deadlocks like this one reported by CONFIG_PROVE_LOCKING=y. [ 304.788780] ================================= [ 304.789686] [ INFO: inconsistent lock state ] [ 304.789686] 2.6.39+ #1 [ 304.789686] --------------------------------- [ 304.789686] inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage. [ 304.789686] ksoftirqd/0/3 [HC0[0]:SC1[1]:HE1:SE0] takes: [ 304.789686] (&(&hdev->lock)->rlock){+.?...}, at: [] hci_conn_check_pending+0x38/0x76 [bluetooth] [ 304.789686] {SOFTIRQ-ON-W} state was registered at: [ 304.789686] [] __lock_acquire+0x347/0xd52 [ 304.789686] [] lock_acquire+0x8a/0xa7 [ 304.789686] [] _raw_spin_lock+0x2c/0x3b [ 304.789686] [] hci_blacklist_del+0x1f/0x8a [bluetooth] [ 304.789686] [] hci_sock_ioctl+0x2d9/0x314 [bluetooth] [ 304.789686] [] sock_ioctl+0x1f2/0x214 [ 304.789686] [] do_vfs_ioctl+0x46c/0x4ad [ 304.789686] [] sys_ioctl+0x42/0x65 [ 304.789686] [] system_call_fastpath+0x16/0x1b [ 304.789686] irq event stamp: 9768 [ 304.789686] hardirqs last enabled at (9768): [] restore_args+0x0/0x30 [ 304.789686] hardirqs last disabled at (9767): [] save_args+0x6a/0x70 [ 304.789686] softirqs last enabled at (9726): [] __do_softirq+0x129/0x13f [ 304.789686] softirqs last disabled at (9739): [] run_ksoftirqd+0x82/0x133 [ 304.789686] [ 304.789686] other info that might help us debug this: [ 304.789686] Possible unsafe locking scenario: [ 304.789686] [ 304.789686] CPU0 [ 304.789686] ---- [ 304.789686] lock(&(&hdev->lock)->rlock); [ 304.789686] [ 304.789686] lock(&(&hdev->lock)->rlock); [ 304.789686] [ 304.789686] *** DEADLOCK *** [ 304.789686] [ 304.789686] 1 lock held by ksoftirqd/0/3: [ 304.789686] #0: (hci_task_lock){++.-..}, at: [] hci_rx_task+0x49/0x2f3 [bluetooth] [ 304.789686] [ 304.789686] stack backtrace: [ 304.789686] Pid: 3, comm: ksoftirqd/0 Not tainted 2.6.39+ #1 [ 304.789686] Call Trace: [ 304.789686] [] print_usage_bug+0x1e7/0x1f8 [ 304.789686] [] ? save_stack_trace+0x27/0x44 [ 304.789686] [] ? print_irq_inversion_bug.part.26+0x19a/0x19a [ 304.789686] [] mark_lock+0x106/0x258 [ 304.789686] [] ? retint_restore_args+0x13/0x13 [ 304.789686] [] __lock_acquire+0x2d3/0xd52 [ 304.789686] [] ? vprintk+0x3ab/0x3d7 [ 304.789686] [] ? printk+0x3c/0x3e [ 304.789686] [] lock_acquire+0x8a/0xa7 [ 304.789686] [] ? hci_conn_check_pending+0x38/0x76 [bluetooth] [ 304.789686] [] ? __dynamic_pr_debug+0x10c/0x11a [ 304.789686] [] _raw_spin_lock+0x2c/0x3b [ 304.789686] [] ? hci_conn_check_pending+0x38/0x76 [bluetooth] [ 304.789686] [] hci_conn_check_pending+0x38/0x76 [bluetooth] [ 304.789686] [] hci_event_packet+0x38e/0x3e12 [bluetooth] [ 304.789686] [] ? lock_release+0x16c/0x179 [ 304.789686] [] ? _raw_read_unlock+0x23/0x27 [ 304.789686] [] ? hci_send_to_sock+0x179/0x188 [bluetooth] [ 304.789686] [] hci_rx_task+0xc8/0x2f3 [bluetooth] [ 304.789686] [] tasklet_action+0x87/0xe6 [ 304.789686] [] __do_softirq+0x9f/0x13f [ 304.789686] [] run_ksoftirqd+0x82/0x133 [ 304.789686] [] ? __do_softirq+0x13f/0x13f [ 304.789686] [] kthread+0x7f/0x87 [ 304.789686] [] kernel_thread_helper+0x4/0x10 [ 304.789686] [] ? retint_restore_args+0x13/0x13 [ 304.789686] [] ? __init_kthread_worker+0x53/0x53 [ 304.789686] [] ? gs_change+0x13/0x13 Signed-off-by: Andre Guedes Signed-off-by: Gustavo F. Padovan commit 5f0dd296a01c8173fcc05a8b262a1168ae90bc74 Author: Gertjan van Wingerde Date: Wed Jul 6 23:00:21 2011 +0200 rt2x00: Implement tx_frames_pending mac80211 callback function. Implementing this callback function will cause mac80211 refrain from going to powersave state when there are still untransmitted TX frames in the queues. This would exactly mimic the behaviour of the legacy vendor driver which also doesn't go in powersave mode if there are still TX frames that are not transmitted. This should make powersaving and rt2x00 a better couple. Signed-off-by: Gertjan van Wingerde Acked-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit acb56120d2c386d6dd104a6515c1a15dabc1ef87 Author: Gertjan van Wingerde Date: Wed Jul 6 22:59:19 2011 +0200 rt2x00: Properly identify rt2800usb devices. Sitecom WLA4000 (USB ID 0x0df6:0x0060) is an RT3072 chipset. Sitecom WLA5000 (USB ID 0x0df6:0x0062) is an RT3572 chipset. Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 71e0b38c2914018b01f3f08b43ee9e3328197699 Author: Gertjan van Wingerde Date: Wed Jul 6 22:58:55 2011 +0200 rt2x00: Add device ID for RT539F device. Reported-by: Wim Vander Schelden Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 128f8f773d77d41a7dbcaf5d36325a0f4e7955cd Author: Gertjan van Wingerde Date: Wed Jul 6 22:57:37 2011 +0200 rt2x00: Reduce window of a queue's tx lock. Currently a lot of actions that can be done without the queue's tx lock being held are done inside the locked area. Move them out to have a leaner and meaner code that operates while the tx lock is being held. Signed-off-by: Gertjan van Wingerde Acked-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 77b5621bac4a56b83b9081f48d4e7d1accdde400 Author: Gertjan van Wingerde Date: Wed Jul 6 22:57:00 2011 +0200 rt2x00: Don't use queue entry as parameter when creating TX descriptor. The functions that create the tx descriptor structure do not operate on a queue entry at all. Signal this fact in the code by not providing a queue entry as a parameter, but the rt2x00 device structure and the skb directly. This patch is a preparation for reducing the time a queue is locked for a tx operation. Signed-off-by: Gertjan van Wingerde Acked-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 77a861c405da75d81e9e6e32c50eb7f9777777e8 Author: Gertjan van Wingerde Date: Wed Jul 6 22:56:24 2011 +0200 rt2x00: Serialize TX operations on a queue. The rt2x00 driver gets frequent occurrences of the following error message when operating under load: phy0 -> rt2x00queue_write_tx_frame: Error - Arrived at non-free entry in the non-full queue 2. This is caused by simultaneous attempts from mac80211 to send a frame via rt2x00, which are not properly serialized inside rt2x00queue_write_tx_frame, causing the second frame to fail sending with the above mentioned error message. Fix this by introducing a per-queue spinlock to serialize the TX operations on that queue. Reported-by: Andreas Hartmann Signed-off-by: Gertjan van Wingerde Acked-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit eb032b9837a958e21ca000358a5bde5e17192ddb Author: Michael Büsch Date: Mon Jul 4 20:50:05 2011 +0200 Update my e-mail address Signed-off-by: Michael Buesch Signed-off-by: Jiri Kosina commit 2e65c9d2c5206eb24439f2dd2daa2f6702df358e Author: Andre Guedes Date: Thu Jun 30 19:20:56 2011 -0300 Bluetooth: Remove enable_smp parameter The enable_smp parameter is no longer needed. It can be replaced by checking lmp_host_le_capable. Signed-off-by: Andre Guedes Signed-off-by: Gustavo F. Padovan commit eead27da60df80a112d1ac3ea482226e9794c26b Author: Andre Guedes Date: Thu Jun 30 19:20:55 2011 -0300 Bluetooth: Add lmp_host_le_capable() macro Since we have the extended LMP features properly implemented, we should check the LMP_HOST_LE bit to know if the host supports LE. Signed-off-by: Andre Guedes Signed-off-by: Gustavo F. Padovan commit e6100a2541987b84af37e4c4247d989644a3aa69 Author: Andre Guedes Date: Thu Jun 30 19:20:54 2011 -0300 Bluetooth: Add enable_le module parameter This patch adds a new module parameter to enable/disable host LE support. By default host LE support is disabled. Signed-off-by: Andre Guedes Signed-off-by: Gustavo F. Padovan commit f9b49306dc0b9f514ffb275ae853c50d7ccd6856 Author: Andre Guedes Date: Thu Jun 30 19:20:53 2011 -0300 Bluetooth: Write LE Host Supported command This patch adds a handler to Write LE Host Supported command complete events. Once this commands has completed successfully, we should read the extended LMP features and update the extfeatures field in hci_dev. Signed-off-by: Andre Guedes Signed-off-by: Gustavo F. Padovan commit 971e3a4bbcbf7378315b85150853d86be59cffe0 Author: Andre Guedes Date: Thu Jun 30 19:20:52 2011 -0300 Bluetooth: Add extfeatures to struct hci_dev This new field holds the extended LMP features value. Some LE mechanism such as discovery procedure needs to read the extended LMP features to work properly. Signed-off-by: Andre Guedes Signed-off-by: Gustavo F. Padovan commit f0c717e6b7ac032e89611fa7629a1fff57e7667a Author: Amitkumar Karwar Date: Tue Jul 5 18:01:11 2011 -0700 mwifiex: modify SDIO aggregation Tx/Rx buffer size The SDIO aggregation buffer size has been modified to an optimum value which gives good throughput results. Signed-off-by: Amitkumar Karwar Signed-off-by: Bing Zhao Signed-off-by: John W. Linville commit 96a95c1abb8235ed26f5915511ce30fbb42de8dd Author: Jean Delvare Date: Wed Jul 6 00:27:06 2011 +0200 ipw2100: Fix command list for debugging There is a stray "undefined" string in the array, get rid of it. Signed-off-by: Jean Delvare Cc: "John W. Linville" Signed-off-by: John W. Linville commit c68f4b892c241bdddeb6f1c1864ac26197229471 Author: Johannes Berg Date: Tue Jul 5 16:35:41 2011 +0200 mac80211: support GTK rekey offload This adds the necessary mac80211 APIs to support GTK rekey offload, mirroring the functionality from cfg80211. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit e5497d766adb92bcbd1fa4a147e188f84f34b20a Author: Johannes Berg Date: Tue Jul 5 16:35:40 2011 +0200 cfg80211/nl80211: support GTK rekey offload In certain circumstances, like WoWLAN scenarios, devices may implement (partial) GTK rekeying on the device to avoid waking up the host for it. In order to successfully go through GTK rekeying, the KEK, KCK and the replay counter are required. Add API to let the supplicant hand the parameters to the driver which may store it for future GTK rekey operations. Note that, of course, if GTK rekeying is done by the device, the EAP frame must not be passed up to userspace, instead a rekey event needs to be sent to let userspace update its replay counter. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 830af02f24fbc087999b757b8eca51829c67fa6f Author: Johannes Berg Date: Tue Jul 5 16:35:39 2011 +0200 mac80211: allow driver to iterate keys When in suspend/wowlan, devices might implement crypto offload differently (more features), and might require reprogramming keys for the WoWLAN (as it is the case for Intel devices that use another uCode image). Thus allow the driver to iterate all keys in this context. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 68dd49ef907f92127aabb30b3368b80eb0ffb459 Author: Jon Mason Date: Thu Jun 30 10:42:47 2011 -0500 iwlwifi: remove unnecessary read of PCI_CAP_ID_EXP The PCIE capability offset is saved during PCI bus walking. It will remove an unnecessary search in the PCI configuration space if this value is referenced instead of reacquiring it. Signed-off-by: Jon Mason Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 333c0dbfcd7847d02d75a2d2a80d2f5e1cdc51dc Merge: 115f945 95dac04f Author: John W. Linville Date: Wed Jul 6 15:03:16 2011 -0400 Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx commit e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4 Merge: 7329f0d 712ae51 Author: David S. Miller Date: Tue Jul 5 23:23:37 2011 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 994635a137f637466d36a7c6272dae014a46a11c Merge: 7d09926 df2cbe4 Author: David S. Miller Date: Tue Jul 5 18:22:39 2011 -0700 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 73e6cdcf479ce3a8d33a726f0477473db35a4b2e Author: Michael Büsch Date: Mon Jul 4 19:51:11 2011 +0200 b43: Add RX side DMA memory barrier This adds a memory barrier to ensure the writes to the ring memory are committed before the DMA ring pointer is updated. We do a similar thing on the TX side already. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 2b4562dfd6ad3579951de21168cb9d266ed3f1bd Author: Johannes Berg Date: Sat Jul 2 00:02:01 2011 +0200 mac80211: allow driver to impose WoWLAN restrictions If the driver can't support WoWLAN in the current state, this patch allows it to return 1 from the suspend callback to do the normal deconfiguration instead of using suspend/resume calls. Note that if it does this, resume won't be called. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 45a771385ceb644941b195f37ab98f7db39776bd Author: Larry Finger Date: Fri Jul 1 08:56:11 2011 -0500 rtlwifi: rtl8192de: Fix error exit from hw_init In routine rtl92de_hw_init(), there are two places where a failure is not handled correctly. Reported-by: Dan Carpenter Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit eb8b27ada953f8de182e628d71feff797707768a Author: Larry Finger Date: Fri Jul 1 08:50:48 2011 -0500 rtlwifi: rtl8192de: Replace loops calling udelay with single mdelay There are a number of loops to implement delays. These are replaced with single calls to mdelay(). The need for a fix was noted by Andrew Morton . Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit c2a7965f528244bc35f41ca64592132c7b3c2515 Author: Christian Lamparter Date: Fri Jul 1 15:28:22 2011 +0200 carl9170: use carl9170 queue enums Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 9928c7d1b1c5e3dcba04a10c7014c9f3319b1fbc Author: Larry Finger Date: Thu Jun 30 16:47:11 2011 -0500 rtlwifi: rtl8192de: Remove comparison of boolean with true Tests of a boolean against "true" are not needed as non-zero is sufficient.. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit f2e795ffae1c4127277ce25727d5ac097f91238c Author: Mike McCormack Date: Thu Jun 30 16:46:14 2011 -0500 rtlwifi: rtl8192{ce,cu,se} Remove irq_enabled This should be unnecessary if synchronize_irq is used. Signed-off-by: Mike McCormack Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 80b69593a8dff5266155f33f9c033f670ee55323 Author: Larry Finger Date: Thu Jun 30 16:44:47 2011 -0500 rtlwifi: rtl8192de: Remove irq_enabled boolean Prepare rtl8192de for the removal of irq_enaqbled. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit faeef8acb18f80abb826f314cfac381c6fcf7a34 Author: Andrew Morton Date: Thu Jun 30 16:28:50 2011 -0500 drivers/net/wireless/rtlwifi/rtl8192de/phy.c: fix udelay() usage ERROR: "__bad_udelay" [drivers/net/wireless/rtlwifi/rtl8192de/rtl8192de.ko] undefined! Signed-off-by: Andrew Morton Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 5e34069cc4cf0d38abfc38e19ad4715036de1540 Author: Christian Lamparter Date: Thu Jun 30 21:08:43 2011 +0200 mac80211: fix smatch complains mlme.c l.757 ieee80211_dynamic_ps_enable_work(11) variable dereferenced before check 'sdata' mesh_pathtbl.c l.650 mesh_path_del(20) double lock 'bottom_half' l.663 mesh_path_del(33) double unlock 'bottom_half' Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 1205f5438f5a9a2dad3a29aa1c015e7bbd3b2b2b Author: Christian Lamparter Date: Thu Jun 30 20:34:54 2011 +0200 carl9170: allow PSM if the 5 GHz band is selected Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit f3716fd7494ce5e2af3c6251275d989bfec98906 Author: Christian Lamparter Date: Thu Jun 30 20:31:34 2011 +0200 carl9170: enable IEEE80211_HW_NEED_DTIM_PERIOD Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 85ee5122abbc1b5c5f3622e46942291a2f6f1261 Author: Christian Lamparter Date: Thu Jun 30 20:27:47 2011 +0200 carl9170: import 1.9.4 firmware headers This patch imports all shared header changes from carl9170fw.git. * update copyright boilerplate * add some more strategic __aligned(4). * WoWLAN Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 3b4670ffe7824d1fc4db2f73101015056ecb4415 Author: Jesper Juhl Date: Wed Jun 29 22:49:33 2011 +0200 net, wireless: Don't return uninitialized in __cfg80211_stop_sched_scan() If the 'driver_initiated' function argument to __cfg80211_stop_sched_scan() is not 0 then we'll return an uninitialized 'err' from the function. Signed-off-by: Jesper Juhl Signed-off-by: John W. Linville commit 3bff1865186c6bb97855f0c13e3850543dce9cef Author: Yogesh Ashok Powar Date: Tue Jun 28 18:41:37 2011 +0530 mac80211: Skip tailroom reservation for full HW-crypto devices with race fix Based on inputs from Johannes Berg from http://article.gmane.org/gmane.linux.kernel.wireless.general/68193 and http://article.gmane.org/gmane.linux.kernel.wireless.general/71702 In xmit path, devices that do full hardware crypto (including MMIC and ICV) need no tailroom. For such devices, tailroom reservation can be skipped if all the keys are programmed into the hardware (i.e software crypto is not used for any of the keys) and none of the keys wants software to generate Michael MIC and IV. v2: Added check for IV along with MMIC. Reported-by: Fabio Rossi Tested-by: Fabio Rossi Signed-off-by: Mohammed Shafi Shajakhan Cc: Mohammed Shafi Shajakhan v3: Fixing races to avoid WARNING: at net/mac80211/wpa.c:397 ccmp_encrypt_skb+0xc4/0x1f0 Reported-by: Andreas Hartmann Tested-by: Andreas Hartmann v4: Added links with message ID Signed-off-by: Yogesh Ashok Powar Signed-off-by: John W. Linville commit 097f882153f0ec13617074fa3bdb683b8215e20c Author: Arik Nemtsov Date: Mon Jun 27 22:06:34 2011 +0300 wl12xx: always initialize AP-mode max power level Sometimes we only get the Tx power level via op->config when the FW is off. Record the received power level when this happens and use it to initialize the firmware during boot. Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit 6cfa5cffde202cabbf0d64c9225ce89f7f7a0d0f Author: Arik Nemtsov Date: Mon Jun 27 22:06:33 2011 +0300 wl12xx: initialize max_power levels for 11a channels Set the maximum FW supported power levels for 11a channels. Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit 73ecce31fe04a2d6c87192cc752b5bd733a8c94a Author: Eliad Peller Date: Mon Jun 27 13:06:45 2011 +0300 wl12xx: implement cancel_hw_scan() callback After implementing cancel_hw_scan(), there is no more need to flush scan_complete_work on suspend. scan_complete_work enqueues a new scan_work, that might lead to the following warning (if the device was already suspended): WARNING: at drivers/mmc/core/core.c:169 mmc_wait_for_req+0x1ac/0x2c8() Backtrace: [] (dump_backtrace+0x0/0x110) [] (dump_stack+0x0/0x1c) [] (warn_slowpath_common+0x0/0x6c) [] (warn_slowpath_null+0x0/0x2c) [] (mmc_wait_for_req+0x0/0x2c8) [] (mmc_io_rw_extended+0x0/0x1e4) [] (sdio_io_rw_ext_helper+0x0/0x1ac) [] (sdio_memcpy_fromio+0x0/0x2c) [] (wl1271_sdio_raw_read+0x0/0x1bc [wl12xx_sdio]) [] (wl1271_cmd_wait_for_event_or_timeout+0x0/0x19c [wl12xx]) [] (wl1271_cmd_wait_for_event+0x0/0x30 [wl12xx]) [] (wl1271_cmd_disconnect+0x0/0x14c [wl12xx]) [] (wl1271_unjoin+0x0/0x48 [wl12xx]) [] (wl1271_op_config+0x0/0x490 [wl12xx]) [] (ieee80211_hw_config+0x0/0x14c [mac80211]) [] (ieee80211_recalc_idle+0x0/0x4c [mac80211]) [] (__ieee80211_scan_completed+0x0/0x1ac [mac80211]) [] (ieee80211_scan_work+0x0/0x484 [mac80211]) [] (worker_thread+0x0/0x1e8) [] (kthread+0x0/0x90) Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit 2aa01597eb29304fe7d863f15300c7b960b587ca Author: Eliad Peller Date: Mon Jun 27 13:06:44 2011 +0300 wl12xx: add stop_scan command define wl1271_scan_stop() to cancel an ongoing hw scan. Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit e85d1629c69f99e91598039e5c05f1608ad19c9f Author: Eliad Peller Date: Mon Jun 27 13:06:43 2011 +0300 wl12xx: configure suspend/resume only if associated/started Configure the device (to wowlan) only if the sta/ap is associated/started. Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit b5d6e5f66304bddc2b5bc7222e993dfeb629ef0c Author: Ohad Ben-Cohen Date: Sun Jun 26 18:00:11 2011 +0300 wl12xx: one SDIO initialization is enough Skip manual device power on in case runtime PM is enabled for our device. This eliminates a secondary & redundant SDIO init sequence. Signed-off-by: Ohad Ben-Cohen Signed-off-by: Luciano Coelho commit 708bb3cf58a9bc90f3171ba64f30601f690e5aaa Author: Arik Nemtsov Date: Fri Jun 24 13:03:37 2011 +0300 wl12xx: implement Tx watermarks per AC Each AC is stopped when its queue is filled up to the high watermark, and restarted when its queue it lower than the low watermark. This ensures congested ACs are not able to starve other ACs. Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit 787b2dc44aa1ae2524f022659c6c6b2d3c979e04 Author: Ido Yariv Date: Fri Jun 24 13:03:36 2011 +0300 wl12xx: Increase low & high TX watermarks The current TX watermark settings cause the driver to stop queues too frequently. Among other things, this can have a negative impact on WMM prioritization, since mac80211 sorts pending packets by their ACs. Fix this by increasing the high watermark to 256 packets. Increase the low watermark to 32 to minimize periods with queues being stopped. Signed-off-by: Ido Yariv Signed-off-by: Luciano Coelho commit 9e374a37b6fa2310b71d3c5657cd0c1e693120c6 Author: Arik Nemtsov Date: Fri Jun 24 13:03:35 2011 +0300 wl12xx: schedule TX packets according to FW occupancy When selecting packets for transmission, prefer the ACs that are least occupied in the FW. When packets for multiple ACs are present in the FW, it decides which to transmit according to WMM QoS parameters. With these changes, lower priority ACs should not be starved when higher priority traffic is present. Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit fae2fd767e9d380ed0d05e4a5d6b1673e2c2d3df Author: Arik Nemtsov Date: Sun Jun 26 10:36:04 2011 +0300 wl12xx: use 802.11 header location after relocation to frame start When operating with TKIP encryption, the function wl1271_tx_fill_hdr() relocates the 802.11 header to the start of the frame, and leaves room for the security header. Some functions in the Tx path rely on the location of the header, namely, for purposes of roaming in STA mode and connecting new stations in AP mode. Call these functions only after the header is relocated. Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit 3618f30f307841dba19f22d9c602a5c59cab30c7 Author: Arik Nemtsov Date: Sun Jun 26 10:36:03 2011 +0300 wl12xx: AP mode - support FW TX inactivity triggers In AP mode we register for the MAX_TX_RETRY and INACTIVE_STA events. Both are reported to the upper layers as a TX failure in the offending stations. Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit b992c68228a3ccdf73ea4f57519e1663839a9cbe Author: Oz Krakowski Date: Sun Jun 26 10:36:02 2011 +0300 wl12xx: fix Tx security sequence number handling Do not reset the security sequence number when issuing a join command or interface is removed. Instead, reset the counter only during the unjoin command. Added the notion of counter wrap-around to the LSB number in wl1271_tx_complete_packet. Added post recovery padding to adjust for potential security number progress during the recovery process by the firmware and avoid potential interop issues in encrypted networks. Signed-off-by: Oz Krakowski Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit d4d2d288972233fc054f3b3341c2a15865fba7c6 Author: Tobias Klauser Date: Mon Jul 4 00:00:22 2011 +0000 net/wireless: ipw2x00: Use helpers from linux/etherdevice.h Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit 02f1b641060486df8eecd66b060ae6551f398593 Author: Mat Martineau Date: Wed Jun 29 14:35:19 2011 -0700 Bluetooth: Check earlier for L2CAP ERTM frames to drop Even when the received tx_seq is expected, the frame still needs to be dropped if the TX window is exceeded or the receiver is in the local busy state. Signed-off-by: Mat Martineau Signed-off-by: Gustavo F. Padovan commit 2461daacb3e2ecca5edea2fa637a1b0922e86515 Author: Gustavo F. Padovan Date: Fri Jun 17 12:57:25 2011 -0300 Bluetooth: Fix bad locking balance Signed-off-by: Gustavo F. Padovan commit 2d25f8b462f3b849d8913d02978657ef06e67dd8 Author: Steven.Li Date: Fri Jul 1 14:02:36 2011 +0800 Bluetooth: Add Atheros AR3012 one PID/VID supported The new Ath3k needs to download patch and radio table, and it keeps same PID/VID even after downloading the patch and radio table. This patch is to use the bcdDevice (Device Release Number) to judge whether the chip has been patched or not. The init bcdDevice value of the chip is 0x0001, this value increases after patch and radio table downloading. Signed-off-by: Steven.Li Signed-off-by: Gustavo F. Padovan commit 252e735d64880b011f6cdeb41ebcac2eaeb58fd3 Author: Emmanuel Grumbach Date: Tue Jun 28 13:13:59 2011 -0700 iwlagn: remove the indirection for the rx write pointer Not needed since the driver split. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit e3f10cea039b235c1de12648ea87b752990c11bf Author: Wey-Yi Guy Date: Fri Jul 1 07:59:26 2011 -0700 iwlagn: remove hcmd ops All "agn" devices use the same hcmd functions, no need to call indirectly. remove hcmd_ops Signed-off-by: Wey-Yi Guy commit e55b517c4d853a5168ebb4cdd58933b17c593827 Author: Wey-Yi Guy Date: Tue Jun 28 11:46:28 2011 -0700 iwlagn: call bt_coex directlly Call the 2-wire and advanced bt-coex function directly to avoid mistake Signed-off-by: Wey-Yi Guy commit f86af7ba82e3449e6ee957e0407cb6c683fa37db Author: Wey-Yi Guy Date: Tue Jun 28 08:01:12 2011 -0700 iwlagn: scd memory boundary Assign memory boundary for SCD context, tx status and translation table Signed-off-by: Wey-Yi Guy commit 02aca585f58a331288026cf78fd4f4ca404cbe12 Author: Emmanuel Grumbach Date: Tue Jun 28 08:58:41 2011 -0700 iwlagn: move the tx allocation funcs to the transport layer These functions allocate all the Tx context. Only the simple tx_init is exported as API. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit a0f6b0a211fbdfbae603ffa434f0d9e691e55ab9 Author: Emmanuel Grumbach Date: Tue Jun 21 14:25:45 2011 +0300 iwlagn: add rx_free to transport layer The transport layer ness to release all rx ressources. This function is an API for it. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit c85eb6196958ae54eba3ff0660d2b5af3d58521a Author: Emmanuel Grumbach Date: Tue Jun 14 10:13:24 2011 +0300 iwlagn: introduce transport layer and implement rx_init The transport layer is responsible for all the queues, DMA rings etc... This is the beginning of the separation of all the code that is tighly related to HW design to the aforementioned transport layer. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 300d0834ebd3f3c57b0063c2fd6bc26d8405626c Author: Wey-Yi Guy Date: Sat Jun 25 09:17:41 2011 -0700 iwlagn: add module parameter to disable stuck queue watchdog timer Add the parameter to disable stuck queue watchdog timer, different platforms might have different timing. Provide the option to disable the timer to prevent un-necessary firmware reload. Signed-off-by: Wey-Yi Guy commit 54e9c409a5f9e58465d80d6774afd85a449a4615 Author: Wey-Yi Guy Date: Fri Jul 1 07:47:59 2011 -0700 iwlagn: add correct firmware name for 135 series 135 series are WiFi/BT combo and require different uCode from 105 series. [A Signed-off-by: Wey-Yi Guy commit 4466320f053bb9aa1d68f73d92cb8d6c5bd75b1c Author: Wey-Yi Guy Date: Fri Jun 24 09:02:44 2011 -0700 iwlagn: re-define the testmode cmd and attr enum To make sure not having issues when adding new testmode commands or attributes in the future, re-define the enum. no functional changes Signed-off-by: Wey-Yi Guy commit 98a648e10a3c4eb30f8043281345506e17ace007 Author: Johannes Berg Date: Mon Jun 27 06:06:42 2011 -0700 iwlagn: verify mutex held for sync commands Emmanuel noticed that there's no explicit checking that prevents the driver from attempting to issue multiple synchronous commands at the same time and wrote a patch to check. However, his patch warns only if a collision actually happened, an unlikely thing since the driver mutex should be held for synchronous command submissions. So instead of checking that a collision happened add a check that the mutex is held which ensures that collisions can't happen. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit e1447d8d8da5ceea60dca027e78274e6ea9b660e Author: Joe Perches Date: Thu Jun 30 19:15:37 2011 -0300 Bluetooth: Add bt_printk Add a local logging function to emit bluetooth specific messages. Using vsprintf extension %pV saves code/text space. Convert the current BT_INFO and BT_ERR macros to use bt_printk. Remove __func__ from BT_ERR macro (and the uses). Prefix "Bluetooth: " to BT_ERR Remove __func__ from BT_DBG as function can be prefixed when using dynamic_debug. With allyesconfig: text data bss dec hex filename 129956 8632 36096 174684 2aa5c drivers/bluetooth/built-in.o.new2 134402 8632 36064 179098 2bb9a drivers/bluetooth/built-in.o.old 14778 1012 3408 19198 4afe net/bluetooth/bnep/built-in.o.new2 15067 1012 3408 19487 4c1f net/bluetooth/bnep/built-in.o.old 346595 19163 86080 451838 6e4fe net/bluetooth/built-in.o.new2 353751 19163 86064 458978 700e2 net/bluetooth/built-in.o.old 18483 1172 4264 23919 5d6f net/bluetooth/cmtp/built-in.o.new2 18927 1172 4264 24363 5f2b net/bluetooth/cmtp/built-in.o.old 19237 1172 5152 25561 63d9 net/bluetooth/hidp/built-in.o.new2 19581 1172 5152 25905 6531 net/bluetooth/hidp/built-in.o.old 59461 3884 14464 77809 12ff1 net/bluetooth/rfcomm/built-in.o.new2 61206 3884 14464 79554 136c2 net/bluetooth/rfcomm/built-in.o.old with x86 defconfig (and just bluetooth): $ size net/bluetooth/built-in.o.defconfig.* text data bss dec hex filename 66358 933 100 67391 1073f net/bluetooth/built-in.o.defconfig.new 66643 933 100 67676 1085c net/bluetooth/built-in.o.defconfig.old Signed-off-by: Joe Perches Signed-off-by: Gustavo F. Padovan commit e175072f377047e28e399c5c661e39e69722f35b Author: Joe Perches Date: Wed Jun 29 18:18:29 2011 -0700 Bluetooth: Rename function bt_err to bt_to_errno Make it easier to use more normal logging styles later. Signed-off-by: Joe Perches Signed-off-by: Gustavo F. Padovan commit 942ecc9c4643db5ce071562e0a23f99464d6b461 Author: Mat Martineau Date: Wed Jun 29 14:35:21 2011 -0700 Bluetooth: ERTM timeouts need to be converted to jiffies ERTM timeouts are defined in milliseconds, but need to be converted to jiffies when passed to mod_timer(). Signed-off-by: Mat Martineau Signed-off-by: Gustavo F. Padovan commit 774e5651460ee7c688914fd76b6caa1675de355c Author: Mat Martineau Date: Wed Jun 29 14:35:20 2011 -0700 Bluetooth: Fix indentation whitespace Signed-off-by: Mat Martineau Signed-off-by: Gustavo F. Padovan commit df2cbe40753dc36af294c30209ed909869aca6cf Merge: 1049f64 9a4ba83 Author: John W. Linville Date: Thu Jun 30 13:34:06 2011 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem commit 9a4ba833a2d0016cf836827e136f0c219834bd41 Author: Dan Carpenter Date: Wed Jun 29 09:31:49 2011 +0300 rtlwifi: potential forever loop in rtl92de_hw_init() "i" should be an int here because we are trying to use it to count to 10000. The original code looks like it could hang in a forever loop. Signed-off-by: Dan Carpenter Acked-by: Larry Finger Signed-off-by: John W. Linville commit ab049fbf5ea87fc92441fc5211c315d04a312cca Author: Larry Finger Date: Tue Jun 28 18:55:50 2011 -0500 rtlwifi: rtl8192de: Fix build errors when using allyes configuration After adding rtl8192de to linux-next, making the rtlwifi drivers be built-in results in the following warnings: LD drivers/net/wireless/rtlwifi/built-in.o drivers/net/wireless/rtlwifi/rtl8192de/built-in.o: In function `rtl92ce_sw_led_on': (.text+0x11fb6): multiple definition of `rtl92ce_sw_led_on' drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:(.text+0xa326): first defined here drivers/net/wireless/rtlwifi/rtl8192de/built-in.o:(.bss+0x0): multiple definition of `dm_digtable' drivers/net/wireless/rtlwifi/rtl8192c/built-in.o:(.bss+0x0): first defined here ld: Warning: size of symbol `dm_digtable' changed from 40 in drivers/net/wireless/rtlwifi/rtl8192c/built-in.o to 48 in drivers/net/wireless/rtlwifi/rtl8192de/built-in.o drivers/net/wireless/rtlwifi/rtl8192de/built-in.o: In function `rtl92ce_sw_led_off': (.text+0x11cfe): multiple definition of `rtl92ce_sw_led_off' drivers/net/wireless/rtlwifi/rtl8192ce/built-in.o:(.text+0xa06e): first defined here Reported-by: Stephen Rothwell Signed-off-by: Larry Finger Acked-by: Stephen Rothwell Signed-off-by: John W. Linville commit a5f377fb9c9758b248773c5b8b1a20d4e7e2c982 Author: Rafał Miłecki Date: Wed Jun 29 00:56:49 2011 +0200 b43: HT-PHY: correct 0x2059 radio init Sometimes additional steps are performed while initializing 2059 radio. We did not find the condition yet, so make it always true for now. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 5cf6fa784a979dce59a5c1b7085e59ee130369e8 Author: Mohammed Shafi Shajakhan Date: Tue Jun 28 20:13:41 2011 +0530 ath9k_htc: Add device ID for Sony UWA-BR100 for more details please take a look at: http://comments.gmane.org/gmane.linux.drivers.ath9k.devel/6541 http://www.wikidevi.com/wiki/Sony_UWA-BR100 Reported-by: Thomas Novin Cc: Rajkumar Manoharan Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit c3d77696b084a644693db0b02419d13375cb5b89 Author: Mohammed Shafi Shajakhan Date: Tue Jun 28 17:30:54 2011 +0530 ath9k: move few descriptor macros to ath9k.h Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 2d02c86b7720c2f0614ed838187b05a7ddb0ea83 Author: Rafał Miłecki Date: Tue Jun 28 09:28:39 2011 +0200 b43: HT-PHY: basic PHY init Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 71d3b0d592601f26be2233a7922d53e762516fee Author: Rafał Miłecki Date: Tue Jun 28 09:28:38 2011 +0200 b43: HT-PHY: add init tables They were written from observing MMIO writes to registers 0x72 0x74 and 0x73 right after phy_write(0x017e) <- 0x3830 which finishes chennel switching. RegExps were used to translate writes to arrays. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 3e644ab47e0cbedc7dd694d3af9996dc514ebf4a Author: Rafał Miłecki Date: Tue Jun 28 00:08:53 2011 +0200 b43: HT-PHY: init radio when enabling it Masks and sets were found in MMIO dumps by using MMIO hacks. Shortly: radio_write(0x0c51) <- 0x0070 radio_write(0x0c5a) <- 0x0003 radio_write(0x0146) <- 0x0003 radio_write(0x0546) <- 0x0003 radio_write(0x0946) <- 0x0003 radio_write(0x002e) <- 0x0078 radio_write(0x00c0) <- 0x0080 radio_write(0x002e) <- 0xff87 radio_write(0x00c0) <- 0xff7f radio_write(0x0011) <- 0xfff7 Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit e8dec1e99aee468c6fb19f07a2660f9205a70f2c Author: Rafał Miłecki Date: Tue Jun 28 00:08:52 2011 +0200 b43: HT-PHY: replace radio routing magic numbers Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit b4d38db121c19fe94862357763b374e44fc23ebb Author: Arik Nemtsov Date: Mon Jun 27 23:58:46 2011 +0300 wl12xx: AP-mode - use mac80211 indication about STA WME support When adding a station, use the information given in the mac80211 populated ieee80211_sta structure to determine if it supports WME. Provide this information to the FW. This patch depends on "mac80211: propagate information about STA WME support down". Signed-off-by: Arik Nemtsov Signed-off-by: John W. Linville commit 39df600aa6ac027b53c4ce3089cba57467a960df Author: Arik Nemtsov Date: Mon Jun 27 23:58:45 2011 +0300 mac80211: propagate information about STA WME support down Add a memeber to the ieee80211_sta structure to indicate whether the STA supports WME. Signed-off-by: Arik Nemtsov Signed-off-by: John W. Linville commit f01dce9474e9f09290707b523a134a9605845b00 Author: Jon Mason Date: Mon Jun 27 13:03:44 2011 -0500 rtlwifi: use PCI_VENDOR_ID_* Use PCI_VENDOR_ID_* from pci_ids.h instead of creating #define locally. Signed-off-by: Jon Mason Signed-off-by: John W. Linville commit 6a4ecc29c90c322e28941e6dec406b08b5e1f0ea Author: Jon Mason Date: Mon Jun 27 12:50:14 2011 -0500 rtlwifi: remove unnecessary read of PCI_CAP_ID_EXP The PCIE capability offset is saved during PCI bus walking. It will remove an unnecessary search in the PCI configuration space if this value is referenced instead of reacquiring it. Also, remove unnecessary and unused #defines for PCI. Signed-off-by: Jon Mason Signed-off-by: John W. Linville commit f05b691150af4cfccbfba6cc708b9a58b9216903 Author: Jon Mason Date: Mon Jun 27 12:48:54 2011 -0500 iwlegacy: remove unnecessary read of PCI_CAP_ID_EXP The PCIE capability offset is saved during PCI bus walking. It will remove an unnecessary search in the PCI configuration space if this value is referenced instead of reacquiring it. Signed-off-by: Jon Mason Signed-off-by: John W. Linville commit bfc8dfec45237e4c9e28f96fdb91167e7e8ddb96 Author: Rafał Miłecki Date: Mon Jun 27 15:04:47 2011 +0200 b43: HT-PHY: implement lacking 0x908 PHY reg op Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit feb90636cc6a99733d3b0b18344b04ca2d2f203e Author: Rafał Miłecki Date: Mon Jun 27 14:58:54 2011 +0200 b43: HT-PHY: add channel switching tables for 2 GHz band Tables were taken from observing writes in MMIO dumps. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit e5b61007bc15b34fe78d4100dbe1be209b761d9b Author: Rafał Miłecki Date: Mon Jun 27 14:58:52 2011 +0200 b43: HT-PHY: perform some tables ops on channel switching Starring at MMIO dumps around PHY channel switching has led to finding serie of 3 similar ops this patch implements. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit bdb2dfb237997babac7b32c7a94dcfa18507a055 Author: Rafał Miłecki Date: Mon Jun 27 14:58:51 2011 +0200 b43: HT-PHY: upload PHY values when switching channel After calibrating radio you can find few PHY writes in MMIO dumps: phy_read(0x0009) -> 0x0000 phy_write(0x01ce) <- 0x03dd phy_write(0x01cf) <- 0x03d9 phy_write(0x01d0) <- 0x03d5 phy_write(0x01d1) <- 0x0424 phy_write(0x01d2) <- 0x0429 phy_write(0x01d3) <- 0x042d By comparing to N-PHY code we found out that they are PHY tables for channel switching plus band info read at the beginning. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 1a93139237180404dc01970dfd33f4a5d5b2054c Author: Rafał Miłecki Date: Mon Jun 27 14:58:50 2011 +0200 b43: HT-PHY: prepare place for HT-PHY tables They are big arrays uploaded to the hardware on init, calibration, etc. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 3be3fdb58ad22f67c5fd12548c88cefe3f726588 Merge: 77b7023 5ee0a58 Author: John W. Linville Date: Tue Jun 28 13:53:32 2011 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-tx.c commit 77b7023afe93b5e3bdcf2c0faaa5e5caafb6ef44 Author: Arik Nemtsov Date: Sun Jun 26 12:06:54 2011 +0300 mac80211: dynamic PS - don't enter PS when TX frames are pending Use the tx_frames_pending() driver callback to determine if Tx frames are pending for its internal queues. If so postpone the dynamic PS timeout to avoid interrupting Tx traffic. The commit e8306f989483e4b97a8b37dd268de6c8c6f35e75 enabled this behavior for drivers with IEEE80211_HW_PS_NULLFUNC_STACK. We enable this for all drivers supporting dynamic PS. This patch helps improve performance in noisy environments. Signed-off-by: Arik Nemtsov Signed-off-by: John W. Linville commit 6691678dca1057840d8f25ee038541d4e4100b17 Author: Sergei Shtylyov Date: Fri Jun 24 19:39:37 2011 +0400 iwlwifi: use pci_dev->revision, again Commit ff938e43d39e926de74b32a3656c190f979ab642 (net: use pci_dev->revision, again) already converted this driver to using the 'revision' field of 'struct pci_dev' but commit 084dd79172cb3aad11d2b7ee5628d57badca7c6e (iwlagn: move PCI related operations from probe and remove to PCI layer) has again added the code to read the PCI revision ID register... Signed-off-by: Sergei Shtylyov Signed-off-by: John W. Linville commit a5e5aa6cee4cdb967a1f1c33a31165062783ccea Author: Dan Carpenter Date: Fri Jun 24 16:33:35 2011 +0300 mwifiex: restore handling of NULL parameters Prior to a5ffddb70c5cab "mwifiex: remove casts of void pointers" the code assumed that the data_buf parameter could be a NULL pointer. The patch preserved some NULL checks but not consistently, so there was a potential for NULL dereferences and it changed the behavior. This patch restores the original behavior. Signed-off-by: Dan Carpenter Acked-by: Bing Zhao Signed-off-by: John W. Linville commit f6b4e4d476b890e1ddebbed8ec4924f9c2750a31 Author: Rajkumar Manoharan Date: Fri Jun 24 17:38:13 2011 +0530 ath9k: Fix locking issue during tx completion The received tx status of aggregated frame without BlockAck may cause deaf state in AR5416 cards. So the driver does a reset to recover. When this happens, we release the pcu_lock before doing a reset as ath_rest acquires pcu_lock. This is ugly and also not atomic. Fixing this addresses the TX DMA failure also. ath_tx_complete_aggr can be called from different paths which takes different variants of spin_lock. This patch also addresses the following warning. WARNING: at kernel/timer.c:1011 del_timer_sync+0x4e/0x50() Call Trace: [] warn_slowpath_common+0x7a/0xb0 [] warn_slowpath_null+0x15/0x20 [] del_timer_sync+0x4e/0x50 [] ath_reset+0x3e/0x210 [ath9k] [] ? _raw_spin_unlock_bh+0x1f/0x30 [] ath_tx_complete_aggr.isra.26+0x54a/0xa40 [ath9k] Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 428bc8c3960d2b18cb9f0d90cfe197ec9a822a54 Author: Stanislaw Gruszka Date: Fri Jun 24 11:34:34 2011 +0200 iwlagn: fix rmmod crash priv->bus.bus_specific pointer is used after priv structures was freed, in iwl_pci_remove(), what make ugly rmmod crash. This bug was introduced by current pci changes. On the way remove fake check, if prober error code is returned from .probe() function, .remove() will never be called be null drvdata. Signed-off-by: Stanislaw Gruszka Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 1d616b14cf3266684af46db614b7de03c7a8a538 Author: Joe Perches Date: Thu Jun 23 15:35:18 2011 -0700 rt2x00: Fix unspeficied typo Signed-off-by: Joe Perches Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit a806c558e01747b499201d2667818f03d79ef1e3 Author: Paul Stewart Date: Thu Jun 23 09:00:11 2011 -0800 mac80211: Drop DS Channel PARAM in directed probe Do not send DS Channel parameter for directed probe requests in order to maximize the chance that we get a response. Some badly-behaved APs don't respond when this parameter is included. Signed-off-by: Paul Stewart Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit 05b60d4e3796c25ae1c78b10d5676ab27062d9b4 Author: Mohammed Shafi Shajakhan Date: Thu Jun 23 20:14:29 2011 +0530 ath9k_hw: make use of the gain_table_entry macro Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit f68e20f0f8bc57dc91d132eaa66956e9ba5aafcf Author: Mohammed Shafi Shajakhan Date: Thu Jun 23 20:03:38 2011 +0530 ath9k_hw: Add carrier leak correction in desired gain calculation Cc: muddin@qca.qualcomm.com Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit dcfcbd590d91e8385eb554aaed419bdebaf4c72a Author: Rajkumar Manoharan Date: Thu Jun 23 13:39:13 2011 +0530 ath9k_hw: Fix false tx hung detection in AR9003 chips The edma based (AR9003 family) chips update tx status descriptors in a common ring buffer for all transmitted frames. Whenever tx interrupt is raised, the descriptors are processed and tx status index is moved. The complete tx stauts ring are updated with beacons tx status when there are no data frames to be sent for a period of time. In this state, transmitting data frames causes the driver to wait for the tx status on an incorrect tx status index though the status was updated by hw properly. The driver detects this condition as a h/w hang and does unnecessary chip resets. This issue was orginally reported in adhoc mode while sending frames after an idle time. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 15b4d843ab66bc0ac2cd46baa20a3ce9638604e6 Author: Arik Nemtsov Date: Thu Jun 23 01:15:27 2011 +0300 mac80211: reestablish mis-configured existing Rx BA sessions When forming a Rx BA session, sometimes the ADDBA response gets lost. This leads to a situation where the session is configured locally, but doesn't exist on the remote side. Subsequent ADDBA requests are declined by mac80211. Fix this by assuming the session state of the initiator is the correct one. When receiving an unexpected ADDBA request on a TID with an active Rx BA session, delete the existing one and establish a new session. Signed-off-by: Arik Nemtsov Acked-by: Johannes Berg Signed-off-by: John W. Linville commit daf4ce85cd5221a3609e68419d01730170975e94 Author: Randy Dunlap Date: Wed Jun 22 10:08:11 2011 -0700 bluetooth: uses crypto interfaces, select CRYPTO Recent changes to hci_core.c use crypto interfaces, so select CRYPTO to make sure that those interfaces are present. Fixes these build errors when CRYPTO is not enabled: net/built-in.o: In function `hci_register_dev': (.text+0x4cf86): undefined reference to `crypto_alloc_base' net/built-in.o: In function `hci_unregister_dev': (.text+0x4f912): undefined reference to `crypto_destroy_tfm' Signed-off-by: Randy Dunlap Signed-off-by: John W. Linville commit 8ee3108075c9e9e2701493a245a754b8b0db8e57 Author: Johannes Berg Date: Wed Jun 22 16:43:48 2011 +0200 mac80211: restrict advertised HW scan rates Advertise only user-requested bitrates in a HW scan. Note that the hw_scan API doesn't currently have a way of asking for a specific probe request bitrate, so we might end up using a bitrate that we don't advertise as supported. I'll fix that later. Also add a hexdump printk to hwsim to verify this. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 04b7dcf979d71e870683c804802e44287a802760 Author: Johannes Berg Date: Wed Jun 22 10:06:59 2011 +0200 wireless: unify QoS control field definitions Move all that mac80211 has into the generic ieee80211.h header file and use them. At the same time move them from mask+shift to just bits and rename them for consistent names. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit f9fc51365d0cf66d1f95f47618566f27177ecbbc Author: Chaoming Li Date: Fri Jun 10 15:12:10 2011 -0500 rtlwifi: rtl8192de: Modify Kconfig and Makefile routines for new driver Set up Kconfig and Makefile for new driver for RTL8192DE. Signed-off-by: Chaoming_Li Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit f34317db363636b50750d39e8a75873d4ee64cfa Author: Larry Finger Date: Fri Jun 10 15:11:55 2011 -0500 rtlwifi: Fix build problems introduced by merging rtl8192de These patches allow compilation of rtlwifi, rtl8192c_common, rtl8192ce, rtl8192cu and rtl8192se to compile after rtl8192de was added. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 674f0523ec07a7c716f5ed8a2debe6632be750f8 Author: Chaoming Li Date: Fri Jun 10 15:11:40 2011 -0500 rtlwifi: rtl8192de: Merge TX and RX routines Merge routines trx.c and trx.h for RTL8192DE. Signed-off-by: Chaoming_Li Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit e501016884dc2112b3742045834302c8adfe3944 Author: Chaoming Li Date: Fri Jun 10 15:11:25 2011 -0500 rtlwifi: rtl8192de: Merge table routines Merge routines table.c and table.h for RTL8192DE. Signed-off-by: Chaoming_Li Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit a7dbd3b50d09c0006babb2ba0bbdba4b0ede5c73 Author: Chaoming Li Date: Fri Jun 10 15:11:10 2011 -0500 rtlwifi: rtl8192de: Merge main (sw) routines Merge routines sw.c and sw.h for RTL8192SE. Signed-off-by: Chaoming_Li Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit f219eff1e51aa598107c9deda0fa0f061371eded Author: Chaoming Li Date: Fri Jun 10 15:10:55 2011 -0500 rtlwifi: rtl8192de: Merge rf routines Merge routines rf.c and rf.h for RTL8192DE. Signed-off-by: Chaoming_Li Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 3de1ef7304aeecbf666c02baacb173e08fa5cb43 Author: Chaoming Li Date: Fri Jun 10 15:10:40 2011 -0500 rtlwifi: rtl8192de: Merge register definitions Merge routines reg.h for RTL8192DE. Signed-off-by: Chaoming_Li Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 7274a8c229805d5ab1228a2d7d8ed304fcfa2bc6 Author: Chaoming Li Date: Fri Jun 10 15:10:25 2011 -0500 rtlwifi: rtl8192de: Merge phy routines Merge routines phy.c and phy.h for RTL8192DE. Signed-off-by: Chaoming_Li Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit f53d5a700694bd8eef081468fd936e0b174b4c94 Author: Chaoming Li Date: Fri Jun 10 15:10:10 2011 -0500 rtlwifi: rtl8192de: Merge led routines Merge routines led.c and led.h for RTL8192DE. Signed-off-by: Chaoming_Li Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 3affdf42373e9f2913238c1881610a258b044648 Author: Chaoming Li Date: Fri Jun 10 15:09:55 2011 -0500 rtlwifi: rtl8192de: Merge hardware routines Merge routines hw.c and hw.h for RTL8192DE. Signed-off-by: Chaoming_Li Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 985d4d3f6dced76f37c8c8d2528fcfe7773cc5f0 Author: Chaoming Li Date: Fri Jun 10 15:09:40 2011 -0500 rtlwifi: rtl8192de: Merge firmware routines Merge routines fw.c and fw.h for RTL8192DE. Signed-off-by: Chaoming_Li Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 4f01358e5b8a4b0f67cfc7bf785756193006de96 Author: Chaoming Li Date: Fri Jun 10 15:09:25 2011 -0500 rtlwifi: rtl8192de: Merge dynamic management routines Merge routines dm.c and dm.h for RTL8192DE. Signed-off-by: Larry Finger Signed-off-by: Chaoming_Li Signed-off-by: John W. Linville commit 23a8c61416955718dfa7ecbb88184b8307ef7c90 Author: Chaoming Li Date: Fri Jun 10 15:09:09 2011 -0500 rtlwifi: rtl8192de: Merge def.h Introduce routine def.h for rtl8192de. Signed-off-by: Chaoming_Li Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit be8943a4457549ce507d170b8da8f8731042caa6 Merge: f70490e f775aa0 Author: John W. Linville Date: Mon Jun 27 15:03:40 2011 -0400 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit 9a7b1501182477299e678b787e32fca5844c7ea1 Author: Randy Dunlap Date: Wed Jun 22 10:08:11 2011 -0700 Bluetooth: uses crypto interfaces, select CRYPTO Recent changes to hci_core.c use crypto interfaces, so select CRYPTO to make sure that those interfaces are present. Fixes these build errors when CRYPTO is not enabled: net/built-in.o: In function `hci_register_dev': (.text+0x4cf86): undefined reference to `crypto_alloc_base' net/built-in.o: In function `hci_unregister_dev': (.text+0x4f912): undefined reference to `crypto_destroy_tfm' Signed-off-by: Randy Dunlap Signed-off-by: Gustavo F. Padovan commit 95dac04f881322b510c45e5ae83f0dbee4f823a2 Author: Ido Yariv Date: Mon Jun 6 14:57:06 2011 +0300 wl12xx: Support routing FW logs to the host A recently added feature to the firmware enables the driver to retrieve firmware logs via the host bus (SDIO or SPI). There are two modes of operation: 1. On-demand: The FW collects its log in an internal ring buffer. This buffer can later be read, for example, upon recovery. 2. Continuous: The FW pushes the FW logs as special packets in the RX path. Reading the internal ring buffer does not involve the FW. Thus, as long as the HW is not in ELP, it should be possible to read the logs, even if the FW crashes. A sysfs binary file named "fwlog" was added to support this feature, letting a monitor process read the FW messages. The log is transferred from the FW only when available, so the reading process might block. Signed-off-by: Ido Yariv Signed-off-by: Luciano Coelho commit baacb9aed020b890ddf6a57837a169092a25fc9b Author: Ido Yariv Date: Mon Jun 6 14:57:05 2011 +0300 wl12xx: Avoid recovery while one is already in progress During recovery work commands sent to the FW could fail and schedule additional recovery work. Since the chip is going to be powered off, avoid recursive recoveries. Signed-off-by: Ido Yariv Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit 842f1a6c71551ac10fbdff4a4e65821228df9ea7 Author: Ido Yariv Date: Mon Jun 6 14:57:04 2011 +0300 wl12xx: Check for FW quirks as soon as the FW boots The FW initialization might depend on the FW revision, so check for any FW quirks right after booting it. Signed-off-by: Ido Yariv Signed-off-by: Luciano Coelho commit 92ef8960aee2f840c6a54c968d40199843f015c0 Author: Eliad Peller Date: Tue Jun 7 12:50:46 2011 +0300 wl12xx: use freezable workqueue for netstack_work When resuming (after wowlan), we want the rx packets (which is usually the wake-up packet itself) to be passed to mac80211 only after the resume notifier was completed, and mac80211 is up and running (otherwise, the packets will be dropped). By enqueueing the netstack_work to a freezable workqueue, we can guarantee the rx processing to occur only after mac80211 was resumed. Signed-off-by: Eliad Peller Signed-off-by: Ido Yariv Signed-off-by: Luciano Coelho commit c27d3accb6f06b0afedfe472dfe0c8e7d87ff0a6 Author: Eliad Peller Date: Tue Jun 7 10:40:39 2011 +0300 wl12xx: use _ni version of ieee80211_tx_status wl1271_flush_deferred_work(), which calls ieee80211_rx() and ieee80211_tx_status(), is called from a process context. hence, use ieee80211_tx_status_ni() instead of ieee80211_tx_status(). Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit ef4b29e976f9e0a622dfd2722b443bb65686f47c Author: Eliad Peller Date: Mon Jun 6 13:03:12 2011 +0300 wl12xx: check the vif's operstate after join When resuming while connected (without wowlan), the interface is already IF_OPER_UP, so we won't get the notifier callback, and hence never complete the association (from wl12xx perspective) This situation, among other potential problems, prevents the station from entering psm. Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit 6bb043321569ac356c790a8d3bd759742e1f9352 Author: Eliad Peller Date: Mon Jun 6 12:21:55 2011 +0300 wl12xx_sdio: enable wowlan only if enable_irq_wake() succeeded Some platforms don't support the wake_irq, so disable wowlan in this case, and avoid the "Unbalanced IRQ wake disable" warning on disable_irq_wake(). Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit 8a7cf3febbb2b7c1ade717ddb3065de67c5983c5 Author: Eliad Peller Date: Mon Jun 6 12:21:54 2011 +0300 wl12xx: enable/disable beacon filtering on ap suspend/resume Beacon filtering needs to be enabled so AP won't wake up by by every received beacon. Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit ff91afc90a736c97f24dec31e642411563906cfb Author: Eliad Peller Date: Mon Jun 6 12:21:53 2011 +0300 wl12xx: clear wl->wow_enabled on resume We set wl->wow_enabled on every suspend(), so we need to clear it on every resume(). (we can't rely on setting wl->wow_enabled=false in suspend(), as it being called only when wowlan triggers are configured) Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit 4a859df85a7855b15f5e1bf4b0869a16757a3e43 Author: Eliad Peller Date: Mon Jun 6 12:21:52 2011 +0300 wl12xx: don't check wow param on suspend/resume Since mac80211 calls suspend/resume only when wowlan triggers exist, there is no need to check for triggers existance in the callbacks as well. Add a WARN_ON() to verify it. Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit 0c005048aa3cd3ac7bfdd3c6fcc20ea4f0ab667d Author: Shahar Levi Date: Sun Jun 12 10:34:43 2011 +0300 wl12xx: Add Support for Low Power DRPw (LPD) Mode The Low Power DRPw (LPD) mode contains several optimizations that designed to reduce power consumption. The purpose is to save current consumption in RX and Listen mode. LPD setting apply only for wl127x AP mode (not wl128x) Signed-off-by: Shahar Levi Signed-off-by: Luciano Coelho commit 86046da4afe068991b77e0a4c4b79b99ad961bda Author: Ohad Ben-Cohen Date: Sun May 29 16:36:03 2011 +0300 wl12xx: don't bail if mmc isn't MMC_CAP_POWER_OFF_CARD If our SDIO function has its runtime PM disabled, don't try to manipulate its runtime PM status at all. This way we can still power on cards plugged to mmc hosts that are not MMC_CAP_POWER_OFF_CARD. Reported-and-tested-by: Tim Yamin Signed-off-by: Ohad Ben-Cohen Signed-off-by: Luciano Coelho commit d2c2bb9fccdfe3cb70b276ae69e53d4890b11871 Author: Luciano Coelho Date: Tue May 31 16:38:56 2011 +0300 wl12xx: split channel array per band in sched_scan The firmware, in practice, treats the channels in three separate blocks, one for each band (bg, a and j). Instead of using a single array and doing some magic with indices, split the array in 3 to make it more readable. Signed-off-by: Luciano Coelho commit d192d268a1fb632148046b8efe9ab78e69890dd2 Author: Eliad Peller Date: Tue May 24 14:33:08 2011 +0300 wl12xx: fix erroneous commit (cb5ae0) Due to rebase error, the patch for commit cb5ae0 ("wl12xx: configure rates when working in ibss mode") was wrong - a blob was added into the wrong function. fix it. Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit a011130265e999056fe0678a064d828c2fd40174 Author: Eliad Peller Date: Wed May 18 11:24:16 2011 +0300 wl12xx: remove unused crc7 references crc7 is used only in wl12xx_spi. Remove redundant crc7.h includes, and update Kconfig to select CRC7 only if WL12XX_SPI is being selected. Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit 0e44eb209343663ad7041ebf9f5d4c393bd89ae9 Author: Shahar Levi Date: Mon May 16 15:35:30 2011 +0300 wl12xx: Enable beacon early termination in 2.4GHz band only Beacon early termination doesn't help much in the 5GHz band and masks channel switch IE Beacons. Thus, change the code to use BET only in 2.4GHz. [Reworded the commit log slightly -- Luca.] Signed-off-by: Shahar Levi Signed-off-by: Luciano Coelho commit c84368e01a00f449d97e8a59e1b0c24dcf70a8b3 Author: Eliad Peller Date: Sun May 15 11:10:30 2011 +0300 wl12xx: add rx_streaming debugfs entry Allow control over rx_streaming interval and operation mode (always/only on coex) via debugfs. e.g. echo 100 > /debug/ieee80211/phy0/wl12xx/rx_streaming/interval echo 1 > /debug/ieee80211/phy0/wl12xx/rx_streaming/always Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit 77ddaa108f727b5ef3be004b952d2c3d3ffc48e5 Author: Eliad Peller Date: Sun May 15 11:10:29 2011 +0300 wl12xx: add automatic rx streaming triggers When rx_streaming.interval is non-zero, use automatic rx streaming. Enable rx streaming on the each rx/tx packet, and disable it rx_streaming.duration msecs later. When rx_streaming.always=0 (default), rx streaming is enabled only when there is a coex operation. Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit f84673d59773ded6efab640c5ee5f44b34116b75 Author: Eliad Peller Date: Sun May 15 11:10:28 2011 +0300 wl12xx: add support for rx streaming wl12xx supports the "rx streaming" feature: When in ps mode, and @timeout msecs have been passed since the last rx/tx, it issues trigger packets (QoS-null/PS-Poll packets, according to the ac type) in const intervals (in order to reduce the rx time). Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit ba2274c68e103271ba0c70fb8ad9afb4ede42d20 Author: Felipe Balbi Date: Sat May 14 00:26:23 2011 +0300 net: wl12xx: remove unnecessary prints Those have little value. Remove those to make the driver less noisy. Signed-off-by: Felipe Balbi Signed-off-by: Luciano Coelho commit 4c4cdfa12f389f0addbbbb6ac984997498a3c3af Author: Felipe Balbi Date: Sat May 14 00:26:22 2011 +0300 net: wl12xx: remove the nops Nops aren't needed. When we actually need those calls, then we add them with meat and barbecue sauce. Signed-off-by: Felipe Balbi Signed-off-by: Luciano Coelho commit 77d7d7a36d270fee4591c1c99c83c2da1f399d44 Author: Felipe Balbi Date: Sat May 14 00:26:21 2011 +0300 net: wl12xx: care for optional operations ->init and ->reset are optional - at least sdio.c doesn't implement them - so allow those pointers to be NULL. Signed-off-by: Felipe Balbi Signed-off-by: Luciano Coelho commit 6bdaf79623e285242cb977840358dc7d14438475 Author: Felipe Balbi Date: Sat May 14 00:26:20 2011 +0300 net: wl12xx: remove some unnecessary prints Those have little value. Remove those to make the driver less noisy. Signed-off-by: Felipe Balbi Signed-off-by: Luciano Coelho commit 33dd74c7844852afba46f5e19911bcf55a1f04a1 Author: Felipe Balbi Date: Sat May 14 00:26:18 2011 +0300 net: wl12xx: sdio: id_tables should be __devinitconst That's only needed during init anyway, let's free some space after we're done probing. Signed-off-by: Felipe Balbi Signed-off-by: Luciano Coelho commit cd5f3e2064ea21e1cbe140728a1b04e7d32f68eb Merge: 95cb365 3609936 Author: David S. Miller Date: Fri Jun 24 14:21:00 2011 -0700 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 36099365c7cc64e5184b66b6eb094950a13f540c Merge: 22c8c93 f70490e Author: John W. Linville Date: Fri Jun 24 15:25:51 2011 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem Conflicts: drivers/net/wireless/rtlwifi/pci.c include/linux/netlink.h commit f70490e6078abe1182437e629f67a7f0b6f08cd4 Author: Stephen Rothwell Date: Thu Jun 23 12:58:55 2011 +1000 Bluetooth: include scatterlist.h where needed net/bluetooth/smp.c: In function 'smp_e': net/bluetooth/smp.c:49:21: error: storage size of 'sg' isn't known net/bluetooth/smp.c:67:2: error: implicit declaration of function 'sg_init_one' net/bluetooth/smp.c:49:21: warning: unused variable 'sg' Caused by commit d22ef0bc83c5 ("Bluetooth: Add LE SMP Cryptoolbox functions"). Missing include file, presumably. This batch has been in the bluetooth tree since June 14, so it may have been exposed by the removal of linux/mm.h from netdevice.h ... Signed-off-by: Stephen Rothwell Signed-off-by: John W. Linville commit f775aa06d2de583bd291d4bf5814784c9ff7b9cc Author: Johannes Berg Date: Wed Jun 22 06:34:09 2011 -0700 iwlagn: don't use CCK rates for P2P interfaces P2P interfaces must not use CCK rates, only OFDM rates are allowed. To set this up, we need to set up the broadcast station to start with 6M instead of starting with 1M. Since the interface type can change, also reset the broadcast station when RXON changes. This will affect beacons as well. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 0b5b3ff15b301338ccec77ebc051308ac614d05d Author: Johannes Berg Date: Wed Jun 22 06:33:43 2011 -0700 iwlagn: fill beacon TX rate properly Use the rate that mac80211 requested to fill the uCode TX command for the beacon. Unfortunately, the uCode is (currently?) ignoring it, but now at least fill it properly. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 81704d2db99386d718e277cd5ac92663abec8a66 Author: Johannes Berg Date: Wed Jun 22 06:39:43 2011 -0700 iwlagn: extend host command timeout We've infrequently seen timeouts, make the wait time match the windows driver; hopefully our driver is just too impatient. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit f8d651a56ef5c9e26a1cddd4f169f5bf4f8dfa9b Author: Johannes Berg Date: Wed Jun 22 04:25:57 2011 -0700 iwlagn: fix cmd queue unmap When we stop the device while a command is in flight that uses multiple TBs, we can leak the DMA buffers for the second and higher TBs. Fix this by using iwlagn_unmap_tfd() as we do when we normally recover the entry. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 1e5cf9b0be4e8902c06bf9600ea0b256e731c862 Author: Johannes Berg Date: Tue Jun 21 04:30:56 2011 -0700 iwlagn: use PM ops macro Simplify the code and use SIMPLE_DEV_PM_OPS to define iwl_dev_pm_ops instead of doing the same thing manually. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 95cb3656c09fcf6577138337216c27744ebc91e2 Author: Jesper Juhl Date: Fri Jun 24 02:40:08 2011 -0700 net: Remove unneeded version.h includes from drivers/net/ It was pointed out by 'make versioncheck' that some includes of linux/version.h are not needed in drivers/net/. This patch removes them. Signed-off-by: Jesper Juhl Signed-off-by: David S. Miller commit cd15598707aff52da4302d9b6a3fc878bca27383 Author: Hauke Mehrtens Date: Tue Jun 21 20:57:16 2011 +0200 ssb: add __devinit to some functions Two functions in ssb are using register_pci_controller() which is __devinit. The functions ssb_pcicore_init_hostmode() and ssb_gige_probe() should also be __devinit. This fixes the following warning: WARNING: vmlinux.o(.text+0x2727b8): Section mismatch in reference from the function ssb_pcicore_init_hostmode() to the function .devinit.text:register_pci_controller() The function ssb_pcicore_init_hostmode() references the function __devinit register_pci_controller(). This is often because ssb_pcicore_init_hostmode lacks a __devinit annotation or the annotation of register_pci_controller is wrong. WARNING: vmlinux.o(.text+0x273398): Section mismatch in reference from the function ssb_gige_probe() to the function .devinit.text:register_pci_controller() The function ssb_gige_probe() references the function __devinit register_pci_controller(). This is often because ssb_gige_probe lacks a __devinit annotation or the annotation of register_pci_controller is wrong. Reported-by: Ralf Baechle Signed-off-by: Hauke Mehrtens Signed-off-by: John W. Linville commit 999a7a88f1b062af5617fa55df317446af86a3da Author: Gabor Juhos Date: Tue Jun 21 11:23:52 2011 +0200 ath9k: enable support for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 7d95847c9b3631d31f657d8cede153b518ed9e2e Author: Gabor Juhos Date: Tue Jun 21 11:23:51 2011 +0200 ath9k: add external_reset callback to ath9k_platfom_data for AR9330 The patch adds a callback to ath9k_platform_data. If the callback is provided by the platform code, then it can be used to hard reset the WMAC device. The callback is required for doing a hard reset of the AR9330 chips to get them working again after a hang. Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 4187afa29a73fec1f68243c03437e7c1b37f315d Author: Gabor Juhos Date: Tue Jun 21 11:23:50 2011 +0200 ath9k: configure internal regulator for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 7b09e49ec822fe2bee34b45af89c72beed254a23 Author: Gabor Juhos Date: Tue Jun 21 11:23:49 2011 +0200 ath9k: configure diversity based on eeprom contents for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit dfc3a7b66c963dfadcd0103c71b6bdaab9b2f738 Author: Gabor Juhos Date: Tue Jun 21 11:23:48 2011 +0200 ath9k: fix few register offsets for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit c4cf2c589ddf7526fa1a3f28580ce8e4e611dd3d Author: Gabor Juhos Date: Tue Jun 21 11:23:47 2011 +0200 ath9k: set diversity group for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit e7ef5bc079672058dcb791a378dc3beb134bd84e Author: Gabor Juhos Date: Tue Jun 21 11:23:46 2011 +0200 ath9k: add fast_div_bias configuration for diversity group 1 The patch adds the missing configuration code for diversity group 1. Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 223c5a87851369de99fa6e6f22c443ed08a0332b Author: Gabor Juhos Date: Tue Jun 21 11:23:45 2011 +0200 ath9k: remove superfluous parentheses Also remove two empty lines. Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit cd0ed1b5fc06cea30a97b131ff4570f8dca3cbd2 Author: Gabor Juhos Date: Tue Jun 21 11:23:44 2011 +0200 ath9k: fix antenna diversity configuration for non AR9485 chips The current values must be used only on AR9485 chips. Other chips requires different values. Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 66ce235a9d6ea8a7b7089d29000eb715c66a6221 Author: Gabor Juhos Date: Tue Jun 21 11:23:43 2011 +0200 ath9k: add a missing case statement to ath_ant_div_comb_alt_check The 'ar9003_hw_antdiv_comb_conf_get' function sets div_group to 2 however that value is not used in 'ath_ant_div_comb_alt_check'. Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 7216198d31450e273fefcb94b4eb3ea07da99131 Author: Gabor Juhos Date: Tue Jun 21 11:23:42 2011 +0200 ath9k: use correct max_streams for AR9330 The AR9330 is a single stream chip. Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 431da56a814959753f7ad6962f0bd5fa0430e508 Author: Gabor Juhos Date: Tue Jun 21 11:23:41 2011 +0200 ath9k: enable antenna diversity for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 0c453732a757d8160e99a23e9b551de8dc7e642c Author: Gabor Juhos Date: Tue Jun 21 11:23:40 2011 +0200 ath9k: set NF limits for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit dc9aa5fc283c79e9aa8d9d1c537d203081634bb1 Author: Gabor Juhos Date: Tue Jun 21 11:23:39 2011 +0200 ath9k: configure xpa bias level for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 5b5c033b59e74392442eb4b052f0b874a0a31c7d Author: Gabor Juhos Date: Tue Jun 21 11:23:38 2011 +0200 ath9k: use correct EEPROM base for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 7d790a21e5d4674fb25da62f560453bc3c248a93 Author: Gabor Juhos Date: Tue Jun 21 11:23:37 2011 +0200 ath9k: enable tuning capacitance configuration for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 7dc5966d5c4a1bc48f1eca01403b187960ad72f4 Author: Gabor Juhos Date: Tue Jun 21 11:23:36 2011 +0200 ath9k: skip internal regulator configuration for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 4033bdad63a871da4c406a4a16d01b6de0a7e56e Author: Gabor Juhos Date: Tue Jun 21 11:23:35 2011 +0200 ath9k: enable TX/RX data byte swap for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 5acb4b9366b77d27f79706cb99b4d34e5076b953 Author: Gabor Juhos Date: Tue Jun 21 11:23:34 2011 +0200 ath9k: configure RF channel frequency for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit dbb204e39fec2dc4800f19eae321ad7e1b95f2fa Author: Gabor Juhos Date: Tue Jun 21 11:23:33 2011 +0200 ath9k: fix channel frequency calculation for AR9340 A multiplication is missing from the current formula. Cc: Vasanthakumar Thiagarajan Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit c1acfbe8637069864b515907025efbbfb577a43c Author: Gabor Juhos Date: Tue Jun 21 11:23:32 2011 +0200 ath9k: read spur frequency information from eeprom for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 0e707a9473bf981111d09ced796e79aad4b4fbca Author: Gabor Juhos Date: Tue Jun 21 11:23:31 2011 +0200 ath9k: don't enable LDPC for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 88e641df19a8f9f36e4ca18f8cdff000be8d5ef9 Author: Gabor Juhos Date: Tue Jun 21 11:23:30 2011 +0200 ath9k: use different BB watchdog timeout value for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit a5415d625d35871dd8eaf3784a402f36c028c29d Author: Gabor Juhos Date: Tue Jun 21 11:23:29 2011 +0200 ath9k: add AR9330 specific PLL initialization Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 77a27da38916626aaaa994e716514dfa990290f7 Author: Gabor Juhos Date: Tue Jun 21 11:23:28 2011 +0200 ath9k: initialize rx gain table for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit a208db944142db1700c6676dc724454213986bed Author: Gabor Juhos Date: Tue Jun 21 11:23:27 2011 +0200 ath9k: initialize tx gain table for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 172805ad46b78717a738ca5c7908c68f0326d3a9 Author: Gabor Juhos Date: Tue Jun 21 11:23:26 2011 +0200 ath9k: initialize mode registers for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 70722ea4344410b99abcedc7309c54db971308fd Author: Gabor Juhos Date: Tue Jun 21 11:23:25 2011 +0200 ath9k: add AR9330 initvals Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit e9b7c5914d4f3a066efcab272b1431d1dbb77297 Author: Gabor Juhos Date: Tue Jun 21 11:23:24 2011 +0200 ath9k: add platform device id for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 3762561aa8afb0bd9fb60d3d847961f9945f8143 Author: Gabor Juhos Date: Tue Jun 21 11:23:23 2011 +0200 ath9k: add MAC revision detection for AR9330 The AR9330 1.0 and 1.1 are using the same revision, thus it is not possible to distinguish the two chips. The platform setup code can distinguish the chips based on the SoC revision. Add a callback function to ath9k_platform_data in order to allow getting the revision number from the platform code. Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 03689301da71fa80957a166e211431bb6e2904e3 Author: Gabor Juhos Date: Tue Jun 21 11:23:22 2011 +0200 ath9k: define device id for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 2c8e59379a02c5c2a478e8ce6ebc481793076792 Author: Gabor Juhos Date: Tue Jun 21 11:23:21 2011 +0200 ath9k: define mac version for AR9330 Signed-off-by: Gabor Juhos Signed-off-by: John W. Linville commit 7952ca5b20e1d54a3bfdfd976086c6f9df5873a2 Author: Mohammed Shafi Shajakhan Date: Tue Jun 21 14:51:46 2011 +0530 ath9k_hw: Fix calculation of PAPRD training power at 5Ghz higher the chainmask, lesser the power_delta to be added to the paprd_training_power Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 9720bb3ab0b80659c63ed337eab66104a4156db0 Author: Johannes Berg Date: Tue Jun 21 09:45:33 2011 +0200 nl80211: use netlink consistent dump feature for BSS dumps Use the new consistent dump feature from (generic) netlink to advertise when dumps are incomplete. Readers may note that this does not initialize the rdev->bss_generation counter to a non-zero value. This is still OK since the value is modified only under spinlock when the list is modified. Since the dump code holds the spinlock, the value will either be > 0 already, or the list will still be empty in which case a consistent dump will actually be made (and be empty). Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit a5ffddb70c5cab29fa00e2fdf12217b64b940796 Author: Amitkumar Karwar Date: Mon Jun 20 15:21:48 2011 -0700 mwifiex: remove casts of void pointers In some cases local pointers are used to cast void pointers passed to the function. Those unnecessary local pointers are also removed. This patch was inspired by Joe Perches' patch [PATCH net-next 1/2] wireless: Remove casts of void *; and the comments from Julian Calaby. Signed-off-by: Amitkumar Karwar Cc: Joe Perches Cc: Julian Calaby Signed-off-by: Bing Zhao Signed-off-by: John W. Linville commit 55f7782e14032c70051aa92d882b4effda407ad5 Author: Jussi Kivilinna Date: Mon Jun 20 14:42:54 2011 +0300 zd1211rw: detect stalled beacon interrupt faster As USB_INT_ID_RETRY_FAILED can override USB_INT_ID_REGS, beacon interrupt (CR_INTERRUPT) might be lost. Problem is that when device trigger CR_INTERRUPT it disables HW interrupt. Now if USB_INT_ID_REGS with CR_INTERRUPT gets lost, beacon interrupt stays disabled until beacon watchdog notices the stall. This happen very often on heavy TX. Improve watchdog to trigger earlier, after three missing beacon interrupts. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit dde4673b8d73dd873e1a62774728e4b7f972facd Author: Jussi Kivilinna Date: Mon Jun 20 14:42:49 2011 +0300 zd1211rw: don't let zd_mac_config_beacon() run too long from beacon interrupt handler zd_mac_config_beacon() has only limited time to set up beacon when called from beacon interrupt handler/worker. So do not let it retry acquiring beacon fifo semaphore in interrupt handler. Beacon fifo semaphore should not be locked by firmware anyway at this time, it's only locked when device is using/txing beacon. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit c900eff30a14ecf209ee7a17a7c3c54890694ce6 Author: Jussi Kivilinna Date: Mon Jun 20 14:42:44 2011 +0300 zd1211rw: handle lost read-reg interrupts Device losses read-reg interrupts. By looking at usbmon it appears that USB_INT_ID_RETRY_FAILED can override USB_INT_ID_REGS. This causes read command to timeout, usually under heavy TX. Fix by retrying read registers again if USB_INT_ID_RETRY_FAILED is received while waiting for USB_INT_ID_REGS. However USB_INT_ID_REGS is not always lost but is received after USB_INT_ID_RETRY_FAILED and is usually received by the retried read command. USB_INT_ID_REGS of the retry is then left unhandled and might be received by next read command. Handle this by ignoring previous USB_INT_ID_REGS that doesn't match current read command request. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit f762d8c3f8b502b93d20bd755fc30ce99d3d0abd Author: Jussi Kivilinna Date: Mon Jun 20 14:42:39 2011 +0300 zd1211rw: only update HW beacon if new beacon differs from currect Update HW beacon only when needed. This appears to make device work in AP-mode (dtim_period=1) somewhat more stable. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit b405e1b83dc2bb662c4be2612674a8d0ef900e26 Author: Jussi Kivilinna Date: Mon Jun 20 14:42:33 2011 +0300 zd1211rw: make 'handle_rx_packet: invalid, small RX packet' message debug-only This message is should be debug-only as it tells almost nothing useful. It also happens very often and just floods logs. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 7a1d6564a15183cb5994656040966df09af8390f Author: Jussi Kivilinna Date: Mon Jun 20 14:42:28 2011 +0300 zd1211rw: fix invalid signal values from device Driver uses IEEE80211_HW_SIGNAL_UNSPEC and so signal values reported to mac80211 should be in range 0..100. Sometimes device return out of range values. These out of range values can then trigger warning in cfg80211_inform_bss_frame. This patch adds checks to enforce range returned from driver to mac80211 be in 0..100 range. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit c1c3daee97498f5d74bfd23531cfe23c8e14a619 Author: Rafał Miłecki Date: Mon Jun 20 03:12:19 2011 +0200 b43: HT-PHY: calibrate radio after switching channel After uploading radio values calibration goes in. In MMIO dump it is: radio_read(0x002b) -> 0x0008 radio_write(0x002b) <- 0x0008 radio_read(0x002e) -> 0x0004 radio_write(0x002e) <- 0x0000 radio_read(0x002e) -> 0x0000 radio_write(0x002e) <- 0x0004 radio_read(0x002b) -> 0x0008 radio_write(0x002b) <- 0x0009 To find masks and sets, MMIO hacks were used to fool closed driver. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit bf4c02d5e772903be5bf8952bac730a2956d0619 Author: Stanislaw Gruszka Date: Sun Jun 19 19:47:39 2011 +0200 rt2x00: reset usb devices at probe When module is reloaded, device may fail to work, with messages: [ 342.211926] phy40 -> rt2x00lib_rxdone_read_signal: Warning - Frame received with unrecognized signal, mode=0x0000, signal=0x0059, type=2. [ 342.314254] phy40 -> rt2x00lib_rxdone_read_signal: Warning - Frame received with unrecognized signal, mode=0x0000, signal=0x004a, type=2. [ 342.416458] phy40 -> rt2x00lib_rxdone: Warning - Wrong frame size 3183 max 2432. [ 342.518605] phy40 -> rt2x00lib_rxdone_read_signal: Warning - Frame received with unrecognized signal, mode=0x0000, signal=0x00c9, type=2. [ 342.620836] phy40 -> rt2x00lib_rxdone_read_signal: Warning - Frame received with unrecognized signal, mode=0x0000, signal=0x00ae, type=1. [ 342.723201] phy40 -> rt2x00lib_rxdone: Warning - Wrong frame size 0 max 2432. [ 342.825399] phy40 -> rt2x00lib_rxdone: Warning - Wrong frame size 0 max 2432. [ 342.927624] phy40 -> rt2x00lib_rxdone: Warning - Wrong frame size 0 max 2432. [ 343.029804] phy40 -> rt2x00lib_rxdone: Warning - Wrong frame size 2491 max 2432. [ 343.132008] phy40 -> rt2x00lib_rxdone: Warning - Wrong frame size 2576 max 2432. [ 343.234326] phy40 -> rt2x00lib_rxdone_read_signal: Warning - Frame received with unrecognized signal, mode=0x0000, signal=0x004c, type=1. [ 343.438723] phy40 -> rt2x00lib_rxdone_read_signal: Warning - Frame received with unrecognized signal, mode=0x0000, signal=0x00e6, type=1. Whereas replugging device make it functional. To solve that problem force reset device during probe. With patch messages are gone. Unfortunately device may sometimes still does not operate correctly after module reload (fail to receive data after associate), but such cases are rarer than without the patch. Signed-off-by: Stanislaw Gruszka Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 7f503fc49f144bb509dbd33daf3426df3f176e6b Author: Stanislaw Gruszka Date: Sun Jun 19 19:46:02 2011 +0200 rt2x00: fix possible memory corruption in case of invalid rxdesc.size Sometimes rxdesc descriptor provided by hardware contains invalid (random) data. For example rxdesc.size can be bigger than actual size of the buffer. When this happen rt2x00crypto_rx_insert_iv() corrupt memory doing memmove outside of buffer boundaries. Signed-off-by: Stanislaw Gruszka Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 9c803a03bc07553f8148d024c15c784b28c1d9ee Author: Rafał Miłecki Date: Sun Jun 19 13:30:21 2011 +0200 b43: N-PHY: move declarations of chantables functions to correct files Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 2a870831776dd37577c6aec7b86189645183e152 Author: Rafał Miłecki Date: Sun Jun 19 13:30:20 2011 +0200 b43: N-PHY: update switching analog on/off Specs were recently updated. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit a6b7da5d2cf8b67c310aedf09e8e74bfb53423ba Author: Rafał Miłecki Date: Sun Jun 19 12:17:21 2011 +0200 b43: HT-PHY: switch radio to requested channel Switching channel happens after specific SHM write to B43_SHM_SH_CHAN. This is the way we found it in BCM4331 MMIO dumps. By comparing with N-PHY code we noticed there is routing used for SYN and TX/RX. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 39ca554c96d25436b7c9acdd8f3b5fb9702049c6 Author: Rafał Miłecki Date: Sun Jun 19 12:17:20 2011 +0200 b43: HT-PHY: add place for implementing channel switching Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 5192bf56b9bb0d90c9aa08e5593ea4897309fc07 Author: Rafał Miłecki Date: Sun Jun 19 12:17:19 2011 +0200 b43: HT-PHY: define standard structs for channel switching Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 1a3f71ae669a599139165c7ae6d8e7908fe12e64 Author: Rafał Miłecki Date: Sun Jun 19 02:18:12 2011 +0200 b43: HT-PHY: enable radio The trick was to find 0x810 PHY reg ops close to analog enabling code. To find out proper masks and sets, MMIO hacks were used. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit e7c62552ec43c094ca523fc46b98181df364f49f Author: Rafał Miłecki Date: Sun Jun 19 02:18:11 2011 +0200 b43: HT-PHY: implement killing radio Closed drivers kill radio right after reading radio version and MACCTL, so it was easy to find related PHY ops: phy_read(0x0810) -> 0x0000 phy_write(0x0810) <- 0x0000 To find out the mask of above OP, MMIO hack was used to fake read val: phy_read(0x0810) -> 0xffff phy_write(0x0810) <- 0x0000 Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 1c1236e3af9c0a52e63c1c386413f13627e68e67 Merge: e10542c 43f3dc4 Author: John W. Linville Date: Wed Jun 22 16:06:58 2011 -0400 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6 commit b7f080cfe223b3b7424872639d153695615a9255 Author: Alexey Dobriyan Date: Thu Jun 16 11:01:34 2011 +0000 net: remove mm.h inclusion from netdevice.h Remove linux/mm.h inclusion from netdevice.h -- it's unused (I've checked manually). To prevent mm.h inclusion via other channels also extract "enum dma_data_direction" definition into separate header. This tiny piece is what gluing netdevice.h with mm.h via "netdevice.h => dmaengine.h => dma-mapping.h => scatterlist.h => mm.h". Removal of mm.h from scatterlist.h was tried and was found not feasible on most archs, so the link was cutoff earlier. Hope people are OK with tiny include file. Note, that mm_types.h is still dragged in, but it is a separate story. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 43d620c82985b19008d87a437b4cf83f356264f7 Author: Joe Perches Date: Thu Jun 16 19:08:06 2011 +0000 drivers/net: Remove casts of void * Unnecessary casts of void * clutter the code. These are the remainder casts after several specific patches to remove netdev_priv and dev_priv. Done via coccinelle script (and a little editing): $ cat cast_void_pointer.cocci @@ type T; T *pt; void *pv; @@ - pt = (T *)pv; + pt = pv; Signed-off-by: Joe Perches Acked-by: Sjur Brændeland Acked-By: Chris Snook Acked-by: Jon Mason Acked-by: Geert Uytterhoeven Acked-by: David Dillow Signed-off-by: David S. Miller commit 43f3dc41571c47a1fbded9aca1cf0a737967b005 Author: Vinicius Costa Gomes Date: Mon Jun 20 18:53:18 2011 -0300 Bluetooth: Fix not setting the chan state When the connection is ready we should set the connection to CONNECTED so userspace can use it. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit 0555891184a5c18df0e2349872e7ecf9701fc5b5 Merge: e13e21d 3306054 Author: Gustavo F. Padovan Date: Tue Jun 21 14:52:56 2011 -0300 Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 Conflicts: net/bluetooth/l2cap_core.c commit 9f6ec8d697c08963d83880ccd35c13c5ace716ea Merge: 4aa3a71 5629937 Author: David S. Miller Date: Mon Jun 20 22:29:08 2011 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-agn-rxon.c drivers/net/wireless/rtlwifi/pci.c net/netfilter/ipvs/ip_vs_core.c commit e10542c447abf7c840931ff12f7d0dee976ca2ea Author: Mike McCormack Date: Mon Jun 20 10:47:51 2011 +0900 rtlwifi: rtl8192{c,ce,cu,se}: Remove comparisons of booleans with true These are a potential source of confusion, as most C code treats all non-zero values as true. Signed-off-by: Mike McCormack Acked-by: Larry Finger Signed-off-by: John W. Linville commit 4b9d8d67b44aae18e1c4b71281f5cfc0f2105cf6 Author: Mike McCormack Date: Mon Jun 20 10:46:05 2011 +0900 rtlwifi: rtl8192cu: Remove unused parameter rtl_ps_set_rf_state's protect_or_not parameter is not set to true anywhere, except for commented out code. It enables some legacy locking code, which is no longer used, so delete the parameter and the old locking code. Signed-off-by: Mike McCormack Acked-by: Larry Finger Signed-off-by: John W. Linville commit 9c0504403725ca77153a0bdad2f3bef0a05e32f0 Author: Mike McCormack Date: Mon Jun 20 10:44:58 2011 +0900 rtlwifi: Fix typo in variable name offchan_deley should be offchan_delay Signed-off-by: Mike McCormack Acked-by: Larry Finger Signed-off-by: John W. Linville commit 536e5189ffdf17047f129f4730d947ab11a8526b Author: Pavel Roskin Date: Fri Jun 17 17:59:02 2011 -0400 ath5k: add missing ieee80211_free_hw() on unload in AHB code Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 0e8d1602b223efcd4eaaa799314f5d7ad1742035 Author: John W. Linville Date: Fri Jun 17 16:41:30 2011 -0400 ath5k: free sc->ah in ath5k_deinit_softc Nothing else is freeing it, and this mirrors the error handling path already in ath5k_init_softc. https://bugzilla.kernel.org/show_bug.cgi?id=37592 Signed-off-by: John W. Linville Reported-by: Tsyvarev Andrey commit 0e44d48cbb010db492a27302b247049d5d43e065 Author: Mohammed Shafi Shajakhan Date: Fri Jun 17 14:08:42 2011 +0530 ath9k_hw: make sure PAPRD training is properly done checking the status of PAPRD_AGC2_POWER(Log(ADC_power) measured after last gain-change in dB) field suggests whether the PAPRD is completely/properly done. This is an additional check apart from polling for PAPRD done bit being set. Susinder suggests that the ideal power range value should be 0xf0 to 0xfe. With AR9382 we do have the values in this range. to have a common check for all platforms we take agc2_power should be atleast greater than 0xe0 Cc: susinder@qca.qualcomm.com Cc: senthilb@qca.qualcomm.com Cc: kmuthusa@qca.qualcomm.com Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 81dc67601a49d1bfcfa85f644b14a013fc59e0ef Author: Mohammed Shafi Shajakhan Date: Fri Jun 17 11:07:32 2011 +0530 ath9k: Fix a corner case failure in sending PAPRD frames in HT40 when the AP is configured with HT40/2.4GHz and when PAPRD is enabled in station we have PAPRD training frames never sent out because of the following failure "PAPRD target power delta out of range". This consistently happens in channel 10,11 in Over The Air testing and rarely in channel 6 under wired setup. the reason behind this issue is all the HT40 rates target power are 0 when we operate in channel 10/11 at 2.4GHz Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 77572fd13d7f468216b85e68a006000726a59e89 Author: Eliad Peller Date: Thu Jun 16 11:49:33 2011 +0300 mac80211: quiesce vif before suspending Cancel all relevant timers/works before suspending (wowlan). This patch handles the following warning: WARNING: at net/mac80211/util.c:565 queueing ieee80211 work while going to suspend Backtrace: [] (ieee80211_can_queue_work+0x0/0x4c [mac80211]) [] (ieee80211_queue_work+0x0/0x30 [mac80211]) [] (ieee80211_sta_timer+0x0/0x3c [mac80211]) [] (run_timer_softirq+0x0/0x220) [] (__do_softirq+0x0/0x130) [] (irq_exit+0x0/0xb4) [] (ipi_timer+0x0/0x4c) [] (do_local_timer+0x0/0x88) [] (cpu_idle+0x0/0xe0) [] (rest_init+0x0/0xe0) [] (start_kernel+0x0/0x314) Signed-off-by: Eliad Peller Signed-off-by: John W. Linville commit e13e21dc5d06bd9ed4a88daf057b8dbe80c220de Author: Vinicius Costa Gomes Date: Fri Jun 17 22:46:27 2011 -0300 Bluetooth: Remove useless access to the socket We already have access to the chan, we don't have to access the socket to get its imtu. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit 6312845169e8719f6f0726efc62bc6a8dedea9d3 Author: Vinicius Costa Gomes Date: Fri Jun 17 22:46:26 2011 -0300 Bluetooth: Fix crash when setting a LE socket to ready We should not try to do any other type of configuration for LE links when they become ready. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit 6392cb387cb629a5aa488e6a2eab9383b574a7ef Merge: 0521ecf3 8943442 Author: John W. Linville Date: Mon Jun 20 15:28:44 2011 -0400 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit 0521ecf335ce36394a3403fdd48aa87a0352c7d6 Author: Kalle Valo Date: Tue Jun 14 01:35:04 2011 +0300 rtlwifi: include mac80211.h from core.h core.h references ieee80211_ops but doesn't include mac80211.h, which issues a warning once mac80211-compat.h is taken into use. Acked-by: Larry Finger Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 9a0669681c2d94fa198a82d108918def55a7cd70 Author: Kalle Valo Date: Tue Jun 14 01:34:57 2011 +0300 zd1211rw: include mac80211.h from zd_chip.h zd_chip.h contains one function with a pointer to ieee80211_hw but doesn't include mac80211.h. As a temporary solution include mac80211.h to avoid a warning. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 47751b0fbff55f5f65d1a4d24ca10acd90259fc1 Author: Kalle Valo Date: Tue Jun 14 01:34:50 2011 +0300 iwlwifi: fix stop/wake queue hacks The hacks break once mac80211-compat.h is taken into use. Fix it by adding an ifdef check. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 2055403ded0b16b8fdb7d6f188dccdc9ca35d7d5 Author: Kalle Valo Date: Tue Jun 14 01:34:38 2011 +0300 iwlegacy: fix stop/wake queue hacks The hacks break once mac80211-compat.h is taken into use. Fix it by adding an ifdef check. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit e44ba033c5654dbfda53461c9b1f7dd9bd1d198f Author: Vitaliy Ivanov Date: Mon Jun 20 16:08:07 2011 +0200 treewide: remove duplicate includes Many stupid corrections of duplicated includes based on the output of scripts/checkincludes.pl. Signed-off-by: Vitaliy Ivanov Signed-off-by: Jiri Kosina commit 89434421d86a69af1868b65c5adbb3abda5af54f Author: Wey-Yi Guy Date: Tue Jun 14 15:23:40 2011 -0700 iwlagn: remove incorrect define Remove unused and incorrect EEPROM define Signed-off-by: Wey-Yi Guy commit 86cb3b4e08a106594ee79c94dec9c7ca289cf999 Author: Wey-Yi Guy Date: Tue Jun 14 15:23:39 2011 -0700 iwlagn: merge duplicate code into single function Same operation needed by multiple devices, move to single function. Signed-off-by: Wey-Yi Guy commit 916b337310969dd5eef35be0988a6bf768c138f9 Author: Wey-Yi Guy Date: Tue Jun 14 13:00:07 2011 -0700 iwlagn: code alignment Code alignment, no functional changes. Signed-off-by: Wey-Yi Guy commit e1910cb3190907334788c1887f8f61913208d0f3 Author: Wey-Yi Guy Date: Mon Jun 13 15:34:25 2011 -0700 iwlagn: add offset define for subsystem id Add offset define for subsystem id in EEPROM Signed-off-by: Wey-Yi Guy commit f7538168915271083070a60ebb10def11fce0cb0 Author: Wey-Yi Guy Date: Sat Jun 11 10:00:06 2011 -0700 iwlagn: Add power_level module parameter Add power_level module parameter to set the default power save level. Power save level has range from 1 - 5, default power save level is 1. Signed-off-by: Wey-Yi Guy commit 0172b02926493863e2e3a35f1d7bf13e935e655c Author: Wey-Yi Guy Date: Sat Jun 11 10:00:05 2011 -0700 iwlagn: add power_save module parameter Add power_save module parameter to enable power management if needed Default power management is disabled. Signed-off-by: Wey-Yi Guy commit 705cd4513a2fc561d8a2d5853cffb102bf183d70 Author: Emmanuel Grumbach Date: Sat Jun 18 08:21:12 2011 -0700 iwlagn: store the irq number to iwl_bus just like dev Since the irq number is just an unsigned int, store it inside iwl_bus instead of calling the get_irq ops every time it is needed. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 4b55b07fc9e5eccfd204cad75509bf062d3c22a3 Author: Emmanuel Grumbach Date: Thu Jun 9 05:48:36 2011 -0700 iwlagn: warn about nested SYNC commands Since there is no protection around SYNC host command mechanism, at least WARN when collision happens between two SYNC host comamnds. I am not sure there is a real issue (beyond the HCMD_ACTIVE flag maintenance) with having two SYNC host commands at the same time, but at least now, we will know about it. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 807caf261c5196b566964ccb9e12d3e25eee9c4a Author: Emmanuel Grumbach Date: Thu Jun 9 02:55:55 2011 -0700 iwlagn: fix misplaced bracket Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit bcd4fe2f9e378eb8d4d07e3be69e3b82d5e6d4fc Author: Emmanuel Grumbach Date: Thu Jun 9 02:55:54 2011 -0700 iwlagn: waterfall the bus level if prepare card failed Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit ea3aa93055508ae3e3a62f90580c24ec381dcbe2 Author: Emmanuel Grumbach Date: Tue May 31 10:07:00 2011 +0300 iwlagn: finally kill the pointer to pci_dev from iwl-dev.h All pci related stuff is in iwl-pci.c. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 08321c062f77e379c4a539f1522220b83ab1e84e Author: Emmanuel Grumbach Date: Fri Jun 10 11:30:30 2011 -0700 iwlagn: add a get_irq method to iwl_bus_ops and use it In order to remove a few more dereference to priv->pdev that will be killed [Asoon, there is now a method to get the IRQ number. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 85aed7c48113dfcdc913008481c46346af0db69e Author: Emmanuel Grumbach Date: Tue May 31 09:58:18 2011 +0300 iwlagn: don't read the PCI_REVISION_ID from iwl-agn.c The PCI_REVISION_ID is read and printed in iwl_pci_probe anyway using pr_info Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 19707bac16129ccebc398dbff9d2b44b17b24fea Author: Emmanuel Grumbach Date: Fri Jun 10 11:28:56 2011 -0700 iwlagn: add a method to get the HW ID description as a string to iwl_bus_ops Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit d57fa99d91bd6e8ca8217c115824b2732f4d3639 Author: Wey-Yi Guy Date: Fri Jun 10 11:23:36 2011 -0700 iwlagn: move PCI power related functions to the PCI layer Continue to popule the PCI layer and the iwl_bus_ops with the power related stuff. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 795414db8607a195541fe1a8f072021011b73386 Author: Emmanuel Grumbach Date: Sat Jun 18 08:12:57 2011 -0700 iwlagn: don't use the PCI wrappers for DMA operation Get a pointer to the struct device during probe and get the rid of all the PCI specific DMA wrappers. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 084dd79172cb3aad11d2b7ee5628d57badca7c6e Author: Emmanuel Grumbach Date: Tue May 31 09:07:00 2011 +0300 iwlagn: move PCI related operations from probe and remove to PCI layer Since we have now a PCI layer, all the init and deinit code that is PCI related should move to there. Also move the IO functions: read8/read32/write32. They need hw_base which is killed from priv. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 3599d39a8525b01540e2c7ec8c5d0df0dd11d6cf Author: Emmanuel Grumbach Date: Tue May 31 08:52:10 2011 +0300 iwlagn: add get_dev to iwl_bus_ops Bus specific layer must know how to return the struct device* of the device. Implement that as a callback of iwl_bus_ops and use that callback instead of using the priv->pdev pointer which is meant to disappear soon. Since the struct device * is needed in hot path, iwl_bus holds a pointer to it instead of calling get_dev all the time. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit a48709c5d076aa3a3f9b6426f462abe6bf432b11 Author: Emmanuel Grumbach Date: Tue May 31 08:22:30 2011 +0300 iwlagn: introduce iwl_bus and iwl_bus_ops iwl_bus will represent a bus, and iwl_bus_ops all the operations that can be done on this bus. For the moment only set_prv_data is implemented. More to come... Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit c6ca8bc46cc320e31e8fcb8b104eeed044febd6f Author: Emmanuel Grumbach Date: Mon May 30 07:36:49 2011 +0300 iwlagn: remove uneeded include to pci.h and dma_mapping.h from a few files Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 48d1a2110ad9cb86e5cb0d790729824fa3cca83b Author: Emmanuel Grumbach Date: Tue May 24 11:39:02 2011 +0300 iwlagn: add a iwl_pci.[ch] files that will contain all PCI specific code Move some PCI functionality to the new iwl_pci.[ch] files: * the PCI_DEVICE_TABLE * the pci_driver struct definition * the PCI probe / remove functions * the PCI suspend / resume functions All these functions are now split: the trigger comes from the PCI layer which calls to the bus generic code located in the other files. This is the beginning only. There are still a lot of PCI related code needs to be gathered. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 7299751df36c02adafb5b897c56de71f0d7e2cb5 Author: Emmanuel Grumbach Date: Tue May 24 10:44:47 2011 +0300 iwlagn: don't disable interrupts after the NIC has been reset It is superfluous to disable the interrupts after we reset the NIC. The only entity that could enable the interrupts after the NIC is reset is the driver. So remove this pointless action. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit ecdbe86eda74005d1b4bc8387e1825ad95fab705 Author: Wey-Yi Guy Date: Wed Jun 8 09:57:26 2011 -0700 iwlagn: Support flush queues for specified interface Flush command can target specified interface or all interfaces Signed-off-by: Wey-Yi Guy commit f88e0ecc896f91d6965ba2935dcdf2280044a30a Author: Wey-Yi Guy Date: Wed Jun 8 09:57:25 2011 -0700 iwlagn: add PAN to tx flush When issue tx flush, also consider PAN Signed-off-by: Wey-Yi Guy commit c68744fb935400964f7af4835017cad5014c8c88 Author: Wey-Yi Guy Date: Sat Jun 18 08:03:18 2011 -0700 iwlagn: Remove un-necessary indirect call After driver split, no need to make indirect call to txfifo flush function Signed-off-by: Wey-Yi Guy commit a7925bd27d6ef020b8f3a3a64bde61d0add07220 Author: Gustavo F. Padovan Date: Fri Jun 17 16:15:10 2011 -0300 Bluetooth: Fix locking in blacklist code There was no unlock call on the errors path Signed-off-by: Gustavo F. Padovan commit a8e827495a3e4d3a096e91b79e644e0665937927 Author: Rafał Miłecki Date: Thu Jun 16 01:59:20 2011 +0200 b43: HT-PHY: implement switching analog Turning it on is always done between reading PHY version and radio version, so it was easy to find it in MMIO dumps from ndiswrapper. Turning off is done by writing different values to the same registers. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 4cabd4254bc6b52a65da859a2c7591f67199ca81 Author: Rafał Miłecki Date: Thu Jun 16 01:59:19 2011 +0200 b43: HT-PHY: implement radio ops Every PHY has some specific bit used for reading radio regs. Analyze of MMIO dumps from BCM4331 and ndiswrapper has shown it is 0x200 for HT. radio_read(0x037f) -> 0x0073 radio_write(0x017f) <- 0x0072 Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d816ab26f6637282feb8a93c9def9925883ba0a7 Author: Pavel Roskin Date: Wed Jun 15 18:03:28 2011 -0400 ath5k: annotate reg in ath5k_hw_nic_reset() as __iomem Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit f5cbc8bac939f38c0c55cfaa348c170663a16767 Author: Pavel Roskin Date: Wed Jun 15 18:03:22 2011 -0400 ath5k: minor cleanup Move an extern variable declaration to a header file. Prefix all functions with "ath5k_". Make ath5k_intr() static. Remove unneeded forward declarations. Remove pointless "extern" in a function declaration. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit e707549a80d5e5b37c4b0b9b60c5836396a11163 Author: Pavel Roskin Date: Wed Jun 15 18:01:11 2011 -0400 ath9k: typo fix in a comment Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit f6351d486dfecd56d57ee194f5d358d9a4fec840 Author: Pavel Roskin Date: Wed Jun 15 18:01:05 2011 -0400 ath9k: use standard max(), remove A_MAX macro Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit d3af4396cff3d86a6a37e1cc5fe8d077f62c263e Author: Mohammed Shafi Shajakhan Date: Wed Jun 15 21:22:16 2011 +0530 ath9k: remove a redundant call to pcipowersave during suspend/resume ath9k_stop will always call ath_radio_disable which will inturn call ath9k_hw_configpcipowersave, so no need to call it explicitly in ath9k_stop Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit a6f0f048875a07b2926c075744eb5edc41bc3c1d Author: Dan Carpenter Date: Wed Jun 15 16:10:10 2011 +0300 iwlegacy: fix up brokenness caused by cleanup Patch 7f1f9742514 "iwlegacy: refactor iwl4965_mac_channel_switch" reversed a test and also it changed a spin_lock_irq() to spin_lock(). I assume the spin_lock change was a mistake because the unlock was left as spin_unlock_irq(). Signed-off-by: Dan Carpenter Signed-off-by: John W. Linville commit d4bb17c4bed70892ea8b749a843a516424ba5638 Author: Mohammed Shafi Shajakhan Date: Wed Jun 15 18:25:31 2011 +0530 ath9k: Add debug messages to track PAPRD failures Add few debug messages for some of the possible scenarios where we can detect PAPRD failures. this will help us to be sure that we had really enabled PAPRD Cc: susinder@qca.qualcomm.com Cc: senthilb@qca.qualcomm.com Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit aec7ffdf4ff24df1fe85ed5bc9e050c4dd77617b Author: Rafał Miłecki Date: Tue Jun 14 08:18:59 2011 +0200 b43: add Kconfig option for compiling SSB driver It is always "y" for now, b43 will not compile without CONFIG_SSB yet. This is just a first step of dropping SSB dependency. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 545a8aa793e04bee7a7e2aa8caa70bed94fd7a5c Author: Nikanth Karthikesan Date: Tue Jun 14 11:23:46 2011 +0530 if_spi: Fix compilation warning - unused variable if_spi: Fix compilation warning - unused variable 'spi' drivers/net/wireless/libertas/if_spi.c: In function ‘if_spi_init_card’: drivers/net/wireless/libertas/if_spi.c:1035: warning: unused variable ‘spi’ The variable is used only in a macro which uses the args only for DEBUG builds. Remove the 'spi' variable completely. Signed-off-by: Nikanth Karthikesan Acked-by: Dan Williams Signed-off-by: John W. Linville commit d7520b1d2a9ffae94323ffac9dc37d92f656051f Author: Rafał Miłecki Date: Mon Jun 13 16:20:06 2011 +0200 b43: HT-PHY: add place for writing HT PHY support This is totally broken plus we do not have specs for HT PHY yet. Just introduce place for writing driver if we discover anything. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 443c1a24710ce151874acdca7efb47622c098e80 Author: Rafał Miłecki Date: Mon Jun 13 16:20:05 2011 +0200 b43: define new PHYs and radio regs for cores >= 24 Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit b856439b1b54358e580aaee5dbe683af5ada9403 Author: Eliad Peller Date: Mon Jun 13 12:47:30 2011 +0300 mac80211: add cancel_hw_scan() callback When suspending, __ieee80211_suspend() calls ieee80211_scan_cancel(), which will only cancel sw scan. In order to cancel hw scan, the low-level driver has to cancel it in the suspend() callback. however, this is too late, as a new scan_work will be enqueued (while the driver is going into suspend). Add a new cancel_hw_scan() callback, asking the driver to cancel an active hw scan, and call it in ieee80211_scan_cancel(). Signed-off-by: Eliad Peller Reviewed-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit a6af1d848179c17deb94621c2e761769f0d99355 Author: Paul Stewart Date: Fri Jun 10 07:00:19 2011 -0800 mac80211: Start monitor work on restart Trigger connection monitor on resume from suspend. Since we have been sleeping, there is reason to suspect that we might not still be associated. The speed of detecting loss of {connection,authentication} is worth the cost of the small additional traffic at resume. Signed-off-by: Paul Stewart Signed-off-by: John W. Linville commit e2ab43536c53ba112a0adfb4c0dba286544c41f6 Author: Gustavo F. Padovan Date: Fri Jun 10 21:28:49 2011 -0300 Bluetooth: Use bit operations on conn_state Instead of setting bits manually we use set_bit, test_bit, etc. Also remove L2CAP_ prefix from macros. Signed-off-by: Gustavo F. Padovan commit c1360a1cf35117d6f3898cb5183ce4349d06714c Author: Gustavo F. Padovan Date: Fri Jun 10 17:02:12 2011 -0300 Bluetooth: use bit operation on conf_state Instead of making the bit operations manually, we now use set_bit, test_bit, etc. Signed-off-by: Gustavo F. Padovan commit 7fbec224cfb44074ab88720c878aa3bdb3158377 Author: Antti Julku Date: Wed Jun 15 12:01:15 2011 +0300 Bluetooth: Add blacklisting support for mgmt interface Management interface commands for blocking and unblocking devices. Signed-off-by: Antti Julku Signed-off-by: Gustavo F. Padovan commit b2a66aad8620337e38d6692f03d94a03d5129840 Author: Antti Julku Date: Wed Jun 15 12:01:14 2011 +0300 Bluetooth: Move blacklisting functions to hci_core Move blacklisting functions to hci_core.c, so that they can be used by both management interface and hci socket interface. Signed-off-by: Antti Julku Signed-off-by: Gustavo F. Padovan commit 3158c50c33c1acddcfa3c57fab812435aa459750 Author: Vinicius Costa Gomes Date: Tue Jun 14 13:37:42 2011 -0300 Bluetooth: Add key size checks for SMP This patch implements a check in smp cmd pairing request and pairing response to verify if encryption key maximum size is compatible in both slave and master when SMP Pairing is requested. Keys are also masked to the correct negotiated size. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Anderson Briglia Signed-off-by: Gustavo F. Padovan commit 5d3de7df18077a0f508ae2c3e3f1866da65fdffd Author: Vinicius Costa Gomes Date: Tue Jun 14 13:37:41 2011 -0300 Bluetooth: Add support for SMP timeout This patch adds support for disconnecting the link when SMP procedure takes more than 30 seconds. SMP begins when either the Pairing Request command is sent or the Pairing Response is received, and it ends when the link is encrypted (or terminated). Vol 3, Part H Section 3.4. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit 94ac02726cb87dd569bac4536f33e4b696b692eb Author: Anderson Lizardo Date: Mon Jun 13 15:42:03 2011 -0400 Bluetooth: fix missing parameter for HCI_OP_DISCONNECT The "dc" variable is initialized but not passed to hci_send_cmd(). Signed-off-by: Anderson Lizardo Signed-off-by: Bruna Moreira Signed-off-by: Gustavo F. Padovan commit da85e5e5afeb72bb6e6b5192a2d252861fafc3e7 Author: Vinicius Costa Gomes Date: Thu Jun 9 18:50:53 2011 -0300 Bluetooth: Add support for Pairing features exchange This patch implements a simple version of the SMP Pairing Features exchange procedure (Vol. 3 Part H, Section 2.3.5.1). For now, everything that would cause a Pairing Method different of Just Works to be chosen is rejected. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit b8e66eacab21870d4f800822111c494f9ef291e3 Author: Vinicius Costa Gomes Date: Thu Jun 9 18:50:52 2011 -0300 Bluetooth: Add support for building pairing commands Before we are able to do a proper exchange of pairing parameters, we need a unified way of building pairing requests and responses. For IO Capability we use the value that was set by userspace, using the management interface. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit 7b5c0d5242295a3b52e7161bf129e2f0e8c624cb Author: Vinicius Costa Gomes Date: Thu Jun 9 18:50:50 2011 -0300 Bluetooth: Fix initial security level of LE links As the default security level (BT_SECURITY_SDP) doesn't make sense for LE links, initialize LE links with something that makes sense. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit f1cb9af557dd8fb5d98fbcc4b5d3eb9d6d235af7 Author: Vinicius Costa Gomes Date: Wed Jan 26 21:42:57 2011 -0300 Bluetooth: Add support for resuming socket when SMP is finished This adds support for resuming the user space traffic when SMP negotiation is complete. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit 9b3d67405b17d61ba8be9d824222fb410f487b8a Author: Vinicius Costa Gomes Date: Thu Jun 9 18:50:48 2011 -0300 Bluetooth: Remove debug statements Now that these commands are sent to the controller we can use hcidump to verify that the correct values are produced. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit a7a595f675f1b33dc73167147321dba5c4395acc Author: Vinicius Costa Gomes Date: Thu Jun 9 18:50:47 2011 -0300 Bluetooth: Add support for LE Start Encryption This adds support for starting SMP Phase 2 Encryption, when the initial SMP negotiation is successful. This adds the LE Start Encryption and LE Long Term Key Request commands and related events. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit 7d24ddcc1140d2f796436e476c8d69469610588b Author: Anderson Briglia Date: Thu Jun 9 18:50:46 2011 -0300 Bluetooth: Add SMP confirmation checks methods This patch includes support for generating and sending the random value used to produce the confirmation value. Signed-off-by: Anderson Briglia Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit f01ead315785768cdb6e928646f90a47640bcdd9 Author: Anderson Briglia Date: Thu Jun 9 18:50:45 2011 -0300 Bluetooth: Add SMP confirmation structs This patch adds initial support for verifying the confirmation value that the remote side has sent. Signed-off-by: Anderson Briglia Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit d22ef0bc83c5a4e7ca9f2791e658dc8949d31ff4 Author: Anderson Briglia Date: Thu Jun 9 18:50:44 2011 -0300 Bluetooth: Add LE SMP Cryptoolbox functions This patch implements SMP crypto functions called ah, c1, s1 and e. It also implements auxiliary functions. All These functions are needed for SMP keys generation. Signed-off-by: Anderson Briglia Signed-off-by: Anderson Lizardo Signed-off-by: Bruna Moreira Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit 3a0259bb80cec7595a2d085a150412d23ba28c81 Author: Vinicius Costa Gomes Date: Thu Jun 9 18:50:43 2011 -0300 Bluetooth: Add support for using the crypto subsystem This will allow using the crypto subsystem for encrypting data. As SMP (Security Manager Protocol) is implemented almost entirely on the host side and the crypto module already implements the needed methods (AES-128), it makes sense to use it. There's now a new module option to enable/disable SMP support. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Anderson Briglia Signed-off-by: Gustavo F. Padovan commit 88ba43b662b6b944c6278ad81a114fa559807776 Author: Anderson Briglia Date: Thu Jun 9 18:50:42 2011 -0300 Bluetooth: Add simple SMP pairing negotiation This implementation only exchanges SMP messages between the Host and the Remote. No keys are being generated. TK and STK generation will be provided in further patches. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Gustavo F. Padovan commit b501d6a1dc21eb61cbbc54e40780084f5d517164 Author: Anderson Briglia Date: Tue Jun 7 18:46:31 2011 -0300 Bluetooth: Start SMP procedure Start SMP procedure for LE connections. This modification intercepts l2cap received frames and call proper SMP functions to start the SMP procedure. By now, no keys are being used. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Anderson Briglia Signed-off-by: Gustavo F. Padovan commit eb492e0169974ac6d168f11d1fc1e2753fe1f3b4 Author: Anderson Briglia Date: Thu Jun 9 18:50:40 2011 -0300 Bluetooth: Implement the first SMP commands These simple commands will allow the SMP procedure to be started and terminated with a not supported error. This is the first step toward something useful. Signed-off-by: Vinicius Costa Gomes Signed-off-by: Anderson Briglia Signed-off-by: Gustavo F. Padovan commit b569450682e944653f307b47c549ca12150d4596 Author: Gustavo F. Padovan Date: Wed Jun 8 19:09:13 2011 -0300 Bluetooth: Don't forget to check for LE_LINK Otherwise the wrong error can be returned. Signed-off-by: Gustavo F. Padovan commit 1a09bcb97ca1b4eb9a6ea381fbc3beb7a9d2895d Author: Gustavo F. Padovan Date: Tue May 17 15:13:19 2011 -0300 Bluetooth: keep reference if any ERTM timer is enabled ERTM use the generic L2CAP timer functions to keep a reference to the channel. This is useful for avoiding crashes. Signed-off-by: Gustavo F. Padovan commit c9b66675373e6edb2dc291562ce1fa05f7980102 Author: Gustavo F. Padovan Date: Tue May 17 14:59:01 2011 -0300 Bluetooth: Make timer functions generic We now plan to use l2cap_set_timer and l2cap_clear_timer in ERTM timers. Signed-off-by: Gustavo F. Padovan commit 71ba0e569bb43ab99a07ccbb514f8b0f732140c3 Author: Gustavo F. Padovan Date: Tue May 17 14:34:52 2011 -0300 Bluetooth: Add refcnt to struct l2cap_chan struct l2cap_chan has now its own refcnt that is compatible with the socket refcnt, i.e., we won't see sk_refcnt = 0 and chan->refcnt > 0. Signed-off-by: Gustavo F. Padovan commit 89bc500e41fc5b48e0573e6b0d927fc97b8951dc Author: Gustavo F. Padovan Date: Fri Jun 3 00:19:47 2011 -0300 Bluetooth: Add state tracking to struct l2cap_chan Now socket state is tracked by struct sock and channel state is tracked by chan->state. At this point both says the same, but this is going to change when we add AMP Support for example. Signed-off-by: Gustavo F. Padovan commit ba3bd0ee3946d9300512e685e8d5573dfa10c060 Author: Gustavo F. Padovan Date: Mon May 16 18:23:24 2011 -0300 Bluetooth: add close() callback to l2cap_chan_ops close() calls l2cap_sock_kill() on l2cap_sock.c Signed-off-by: Gustavo F. Padovan commit 230704942283cb3990584ddd6955ac8decfa6a2c Author: Gustavo F. Padovan Date: Mon May 16 17:57:22 2011 -0300 Bluetooth: add recv() callback to l2cap_chan_ops This abstracts the call to sock_queue_recv_skb() into l2cap_chan_ops->recv(). Signed-off-by: Gustavo F. Padovan commit 80808e431e1ef25856457de82ce141bed6a6313a Author: Gustavo F. Padovan Date: Mon May 16 17:24:37 2011 -0300 Bluetooth: Add l2cap_chan_ops abstraction Add an abstraction layer between L2CAP core and its users (only l2cap_sock.c now). The first function implemented is new_connection() that replaces calls to l2cap_sock_alloc() in l2cap_core.c Signed-off-by: Gustavo F. Padovan commit dc50a06dac61d7ca7ddb3d9bb8921ca5d68f51b6 Author: Gustavo F. Padovan Date: Mon May 16 16:42:01 2011 -0300 Bluetooth: Merge l2cap_chan_create() in the l2cap_sock_alloc() As a first step to remove l2cap_sock_alloc() and l2cap_sock_init() from l2cap_core.c Signed-off-by: Gustavo F. Padovan commit b2ea345eab568062b321bcd3b8d72f14c93dbb63 Author: Wey-Yi Guy Date: Tue Jun 7 08:53:14 2011 -0700 iwlagn: Sanity check for valid context Check EEPROM for multiple contexts support Signed-off-by: Wey-Yi Guy commit 4f0642a6665d1f4dbf8ef472dd5620e7585357b9 Author: Wey-Yi Guy Date: Mon Jun 6 16:28:54 2011 -0700 iwlagn: Sanity check for 11n capability Make sure when we say 11n enable, we really support it. Signed-off-by: Wey-Yi Guy commit 1f8bf0396ae7e63648b210fd197b1a5ab0db51bf Author: Wey-Yi Guy Date: Mon Jun 6 14:26:43 2011 -0700 iwlagn: merge duplicated code into single place Multiple places have similar code to construct calib header. Merge into single inline function. Signed-off-by: Wey-Yi Guy commit 109a0ac5d8ed35914f5ce5c6d36244c08963c6cb Author: Wey-Yi Guy Date: Mon Jun 6 14:26:42 2011 -0700 iwlagn: group similar defines together No functional changes, just group similar defines together Signed-off-by: Wey-Yi Guy commit 8d8854d983ab7217d322269c9bd17c1f8c481ae8 Author: Wey-Yi Guy Date: Mon Jun 6 14:26:41 2011 -0700 iwlagn: generic temperature location in EEPROM Temperature location in EEPROM is generic to all devices Signed-off-by: Wey-Yi Guy commit bf300252baa383065851e2ed6af41e5f9735fe9c Author: Wey-Yi Guy Date: Mon Jun 6 14:26:40 2011 -0700 iwlagn: remove unused debug flag Remove both IWL_DEBUG_TXPOWER and IWL_DEBUG_NOTIF, not used. Signed-off-by: Wey-Yi Guy commit 06bb83589c4feac9bbb8d0d27d72f9d346f770c0 Author: Wey-Yi Guy Date: Mon Jun 6 14:26:38 2011 -0700 iwlagn: use IWL_DEBUG_FW for firmware related debug msg Instead use generic IWL_DEBUG_INFO, use IWL_DEBUG_FW for uCode related stuffs. Signed-off-by: Wey-Yi Guy commit f38f884b3b291c895d1033f02e351532d1d3f1dc Author: Wey-Yi Guy Date: Mon Jun 6 14:26:39 2011 -0700 iwlagn: use IWL_DEBUG_TEMP for temperature related debug Instead of IWL_DEBUG_POWER, IWL_DEBUG_TEMP should be used for temperature related debug messages Signed-off-by: Wey-Yi Guy commit fa7f1413ed93a662839460e90dd6a5d045df2c03 Author: Wey-Yi Guy Date: Mon Jun 6 12:49:25 2011 -0700 iwlagn: add debug message for coex related activities Adding dedicated debug message for coex related activities Signed-off-by: Wey-Yi Guy commit ebbb491e8efac3c0a6f880f676374fc1605469f5 Author: Wey-Yi Guy Date: Mon Jun 6 12:49:24 2011 -0700 iwlagn: add coex debug flag Replace IWL_DEBUG_AP with IWL_DEBUG_COEX for debug COEX related stuffs Signed-off-by: Wey-Yi Guy commit 8895075886bbcfdab6ad7923ae8ab3b3314549c4 Author: Wey-Yi Guy Date: Mon Jun 6 12:05:46 2011 -0700 iwlagn: use sku capabilities information from EEPROM Instead of having the separated define, use the sku capabilities in EEPROM Signed-off-by: Wey-Yi Guy commit 052692976e40bc124a8615ec880dd83046d71c24 Author: Wey-Yi Guy Date: Mon Jun 6 12:05:45 2011 -0700 iwlagn: Band capabilities in EEPROM Add define for band capabilities in EEPROM Signed-off-by: Wey-Yi Guy commit 872907bb17fe2d8d01d0e9723f72f91cb4ea103f Author: Johannes Berg Date: Mon Jun 6 09:41:15 2011 -0700 iwlagn: don't check ucode subtype The ucode subtypes keep changing, and there's no particular reason to be checking them (other than a paranoid sanity check). Since the numbers are also in conflict between different ucode images now, simply don't check them any more and rely on the images being built correctly. Also, to indicate that, rename the constants and the enum, moving it to a different file. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 3f1e5f4a2b0993b6e81b5665b28568624f581b0f Author: Wey-Yi Guy Date: Fri Jun 3 13:52:40 2011 -0700 iwlagn: move no_sleep_autoadjust as part of iwlagn_mod_params Move no_sleep_autoadjust module parameter into iwlagn_mod_params structure along with all the other iwlagn module parameters Signed-off-by: Wey-Yi Guy commit 6b0184c4c62beb15443fd6dd5080f0e18941b67b Author: Wey-Yi Guy Date: Fri Jun 3 13:52:39 2011 -0700 iwlagn: move led_mode as part of iwlagn_mod_params Move led_mode module parameter into iwlagn_mod_params structure along with all the other iwlagn module parameters Signed-off-by: Wey-Yi Guy commit b60eec9bf07307ad40e9304d39eb9107acb2fb0c Author: Wey-Yi Guy Date: Fri Jun 3 13:52:38 2011 -0700 iwlagn: move bt_coex_active as part of iwlagn_mod_params Move bt_coex_active module parameter into iwlagn_mod_params structure along with all the other iwlagn module parameters Signed-off-by: Wey-Yi Guy commit eb64dca0c9d73e191026ed37d1075f22e48b3f1c Author: Wey-Yi Guy Date: Tue May 31 08:03:02 2011 -0700 iwlagn: add dumpit support for testmode trace function For testmode trace function, huge amout of data need to pass to userspace. Use the build-in nl80211 dumpt it function Require nl80211 testmode dumpit support patch. Signed-off-by: Wey-Yi Guy commit 49b72100165e3b2046be15a8e4f766f5169e708d Author: Wey-Yi Guy Date: Mon May 30 10:29:37 2011 -0700 iwlagn: usersapce application decide the size of trace buffer For testmode trace function, allow userspace application to request the size of trace buffer. Signed-off-by: Wey-Yi Guy commit 7101f4043cdaa5dc2bf8974313744246f3955de7 Author: Larry Finger Date: Fri Jun 10 11:05:23 2011 -0500 rtlwifi: Fix warnings on parisc arch In "Build regressions/improvements in v3.0-rc2", Geert Uytterhoeven reports a number of warnings that occur for parisc builds of rtlwifi and dependents. Reported-by: Geert Uytterhoeven Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 5b49b35a671e59c16c33611ea2d5650438388663 Author: Dan Carpenter Date: Thu Jun 9 10:09:34 2011 +0300 b43: check for allocation failures Add some error handling if the allocation fails. Signed-off-by: Dan Carpenter Signed-off-by: John W. Linville commit 287546df342daaa146c840ce26b3ed012a055de5 Author: Amitkumar Karwar Date: Wed Jun 8 20:39:20 2011 +0530 mwifiex: get rid of global adapter pointer 1) Avoid global adapter pointer usage a) in sdio.c by moving some code from mwifiex_cleanup_module() to mwifiex_sdio_remove(). b) in main.c by passing an extra parameter to few functions. 2) Add new variable "user_rmmod" to identify if mwifiex_sdio_remove() callback function is called in card removal or rmmod context. These code changes are adapted from Libertas driver. 3) Remove unnecessary NULL pointer check for "func" pointer in mwifiex_sdio_remove(). Signed-off-by: Amitkumar Karwar Signed-off-by: Yogesh Ashok Powar Signed-off-by: Bing Zhao Signed-off-by: John W. Linville commit 7f1f974251493d3929ebd422796e6f9f2bcd6956 Author: Stanislaw Gruszka Date: Wed Jun 8 15:28:29 2011 +0200 iwlegacy: refactor iwl4965_mac_channel_switch Use less indentions and remove uneeded irq-save flags. Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit 0d01550f3dec4efc8e88bdefb27b9fa7522603f7 Author: Stanislaw Gruszka Date: Wed Jun 8 15:28:28 2011 +0200 iwlegacy: remove unused agg_tids_count Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit 1ba2f121f9e1d98dd838644f76fa23837dd28913 Author: Stanislaw Gruszka Date: Wed Jun 8 15:28:27 2011 +0200 iwlegacy: remove firmware event log Messages like that iwl4965 0000:03:00.0: Start IWL Event Log Dump: display last 20 entries iwl4965 0000:03:00.0: EVT_LOGT:1821445332:0x00000000:1352 iwl4965 0000:03:00.0: EVT_LOGT:1821445332:0x00000001:1353 iwl4965 0000:03:00.0: EVT_LOGT:1821445336:0x0000000c:0357 iwl4965 0000:03:00.0: EVT_LOGT:1821445533:0x00000107:0106 iwl4965 0000:03:00.0: EVT_LOGT:1821445534:0x00000000:0302 iwl4965 0000:03:00.0: EVT_LOGT:1821445574:0x000000d4:0321 iwl4965 0000:03:00.0: EVT_LOGT:1821445575:0x00000000:1350 iwl4965 0000:03:00.0: EVT_LOGT:1821445576:0x00000000:1351 iwl4965 0000:03:00.0: EVT_LOGT:1821445576:0x00000000:1352 iwl4965 0000:03:00.0: EVT_LOGT:1821445577:0x00000001:1353 iwl4965 0000:03:00.0: EVT_LOGT:1821445581:0x0000000d:0357 iwl4965 0000:03:00.0: EVT_LOGT:1821446327:0x00000107:0106 iwl4965 0000:03:00.0: EVT_LOGT:1821446328:0x00000000:0302 iwl4965 0000:03:00.0: EVT_LOGT:1821446368:0x000000d4:0321 iwl4965 0000:03:00.0: EVT_LOGT:1821446369:0x00000000:1350 iwl4965 0000:03:00.0: EVT_LOGT:1821446370:0x00000000:1351 iwl4965 0000:03:00.0: EVT_LOGT:1821446370:0x00000000:1352 iwl4965 0000:03:00.0: EVT_LOGT:1821446371:0x00000001:1353 iwl4965 0000:03:00.0: EVT_LOGT:1821446375:0x0000000e:0357 iwl4965 0000:03:00.0: EVT_LOGT:1821446383:0x00000000:0125 are completely useless for me. Remove bunch of code that generate them. Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit dd6d2a8aef69cfef8acf1ff7ebb22a763c9ba56f Author: Stanislaw Gruszka Date: Wed Jun 8 15:28:26 2011 +0200 iwlegacy: remove reset rf infrastructure We do not reset radio anymore, hence don't need that code too. Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit ecaee0ff07d429a8571ea015c00a211c17a86494 Author: Stanislaw Gruszka Date: Wed Jun 8 15:28:25 2011 +0200 iwlegacy: remove recover from statistics Recover from statistics code was added during 6xxx devices development, I don't think is needed on old devices. Also it is suspicious to cause random, unreproducible microcode errors and hangs. So remove it. Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit 3c09b174da3de867e61c4dcca765417a98ba961e Author: Stanislaw Gruszka Date: Wed Jun 8 15:28:24 2011 +0200 iwlegacy: remove unused power commands defines Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit 9a821f5d0fc36425e95f0f4ade4bbca8f0ebff4d Author: Daniel Drake Date: Tue Jun 7 18:15:57 2011 +0100 libertas: add sd8686 reset_card support At http://dev.laptop.org/ticket/10748 we are seeing a case of the libertas firmware randomly stopping responding to commands after resume. Careful monitoring of communications indicates a firmware or hardware bug, which has been reported to Marvell. Work around this issue by adding a reset_card method; this is automatically called when command timeouts are detected and provides an instant recovery to this situation. Signed-off-by: Daniel Drake Signed-off-by: John W. Linville commit 43a1c2721acd792aea370ee68ef054e18c944373 Author: Vincent Zweije Date: Tue Jun 7 16:37:09 2011 +0200 networking: fix warning about unused label wake_up Function ieee80211_reconfig in net/mac80211/util.c contains label wake_up which is defined unconditionally, but only used with CONFIG_PM. Gcc warns about this when CONFIG_PM is not defined. This patch makes the label's definition dependent on CONFIG_PM too, eliminating the warning. The issue was apparently introduced in git commit eecc48000afe2ca6da22122d553b7cad294e42fc. Signed-off-by: Vincent Zweije Signed-off-by: John W. Linville commit 323222b5ff930a43eab45cec6e58345740fa2a29 Author: Paul Stewart Date: Wed Jun 8 05:52:52 2011 -0700 cfg80211: Ignore downstream DEAUTH for authtry_bsses Downsteram DEAUTH messages do not refer to a current authentication attempt -- AUTH responses do. Therefore we should not allow DEAUTH from an AP to void state for an AUTH attempt in progress. Signed-off-by: Paul Stewart Signed-off-by: John W. Linville commit fd854772c11d6ad0377f0b613142e397bec58a3a Author: Mike McCormack Date: Mon Jun 6 23:13:06 2011 +0900 rtlwifi: Factor out code to receive one packet Signed-off-by: Mike McCormack Signed-off-by: John W. Linville commit 14058adddd4fd40e45c434c801e8ed8baf09251e Author: Mike McCormack Date: Mon Jun 6 23:12:53 2011 +0900 rtlwifi: Free skb in one place Signed-off-by: Mike McCormack Signed-off-by: John W. Linville commit 8db8ddf13dda0fc96937bcb6e10563e7b9a20387 Author: Mike McCormack Date: Mon Jun 6 23:12:42 2011 +0900 rtlwifi: Resubmit skbs with bad CRC early Once we realize a bad packet was received, don't waste time unmapping it, freeing it, then allocation a new skb and mapping it, just resubmit the existing skb. Signed-off-by: Mike McCormack Signed-off-by: John W. Linville commit 2c333366a4ec1f4cdbaec285ba448d5943df8ffd Author: Mike McCormack Date: Mon Jun 6 23:12:08 2011 +0900 rtlwifi: Remove unnecessary indent Signed-off-by: Mike McCormack Signed-off-by: John W. Linville commit 1d34d108e07680e2c07847d5e69a334cb4f96ab3 Author: Eliad Peller Date: Mon Jun 6 12:59:29 2011 +0300 mac80211: add ieee80211_get_operstate() function Add ieee80211_get_operstate() function to get the operstate of the netdevice. This is needed for drivers that need to know when the interface is IF_OPER_UP (e.g. wl12xx), and block notifiers can't be used (e.g. because the interface is already IF_OPER_UP, like after resuming from suspend) Signed-off-by: Eliad Peller Signed-off-by: John W. Linville commit c48b1f729a75880d0895f0b23efaf551ee800a35 Merge: 448f262 51e6525 Author: John W. Linville Date: Fri Jun 10 14:26:12 2011 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-agn-rxon.c drivers/net/wireless/rtlwifi/pci.c commit 448f2627c169092d2091a1be22feb6a7775f6201 Merge: 5a9d0a3 6de6c18 Author: Gustavo F. Padovan Date: Thu Jun 9 16:33:54 2011 -0300 Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 Conflicts: net/bluetooth/rfcomm/sock.c commit d29d04ce0f49b9fbcaefc83ec4e9bdb7badd45fa Author: David Miller Date: Thu May 19 17:50:05 2011 -0400 Bluetooth: Kill set but unused variable 'cmd' in cmtp_recv_capimsg() Signed-off-by: David S. Miller Signed-off-by: Gustavo F. Padovan commit 6de6c18d8d3b2a82cc1c657f005e61b1c1f2f886 Author: Ville Tervo Date: Fri May 27 11:16:21 2011 +0300 Bluetooth: Do not send SET_EVENT_MASK for 1.1 and earlier devices Some old hci controllers do not accept any mask so leave the default mask on for these devices. < HCI Command: Set Event Mask (0x03|0x0001) plen 8 Mask: 0xfffffbff00000000 > HCI Event: Command Complete (0x0e) plen 4 Set Event Mask (0x03|0x0001) ncmd 1 status 0x12 Error: Invalid HCI Command Parameters Signed-off-by: Ville Tervo Tested-by: Corey Boyle Tested-by: Ed Tomlinson Signed-off-by: Gustavo F. Padovan commit 0b28d7373562938a9e6f38c259f66082e99cb9a9 Author: David Miller Date: Thu May 19 17:37:45 2011 -0400 Bluetooth: Do not ignore errors returned from strict_strtol() Signed-off-by: David S. Miller Signed-off-by: Gustavo F. Padovan commit 4a77708b055a71bf769a917283a9eba3dcedb017 Author: Luiz Augusto von Dentz Date: Thu May 12 11:13:15 2011 +0300 Bluetooth: fix shutdown on SCO sockets shutdown should wait for SCO link to be properly disconnected before detroying the socket, otherwise an application using the socket may assume link is properly disconnected before it really happens which can be a problem when e.g synchronizing profile switch. Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Gustavo F. Padovan commit d0fad89da9801b3945d2ee7243ecbc75b3da6f09 Author: Stephen Boyd Date: Thu May 12 16:50:09 2011 -0700 Bluetooth: Silence DEBUG_STRICT_USER_COPY_CHECKS=y warning Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning: In function 'copy_from_user', inlined from 'rfcomm_sock_setsockopt' at net/bluetooth/rfcomm/sock.c:705: arch/x86/include/asm/uaccess_64.h:65: warning: call to 'copy_from_user_overflow' declared with attribute warning: copy_from_user() buffer size is not provably correct presumably due to buf_size being signed causing GCC to fail to see that buf_size can't become negative. Cc: Marcel Holtmann Cc: Gustavo F. Padovan Signed-off-by: Stephen Boyd Signed-off-by: Gustavo F. Padovan commit e694928067b52f569a7df39b7f02efd7b34ab8f4 Author: Mat Martineau Date: Fri Jun 3 16:21:10 2011 -0700 Bluetooth: Fix check for the ERTM local busy state Local busy is encoded in a bitfield, but was not masked out correctly. Signed-off-by: Mat Martineau Signed-off-by: Gustavo F. Padovan commit d8d69c54fb8fbb7483180b609f99f2e3e539962b Author: Mat Martineau Date: Fri Jun 3 16:21:07 2011 -0700 Bluetooth: Restore accidentally-deleted line When code was moved from l2cap_core.c to l2cap_sock.c in commit 6de0702b5b93da0ef097aa092b4597fbc024ebba, one line was dropped from the old __l2cap_sock_close() implementation. This sk_state change should still be in l2cap_chan_close(). Signed-off-by: Mat Martineau Signed-off-by: Gustavo F. Padovan commit ef4177e2bf92543e422fae154888062376e2283d Author: Waldemar Rymarkiewicz Date: Thu Jun 2 14:24:52 2011 +0200 Bluetooth: Simplify hci_conn_accept_secure check If the link key is secure (authenticated or combination 16 digit) the sec_level will be always BT_SECURITY_HIGH. Therefore, instead of checking the link key type simply check the sec_level on the link. Signed-off-by: Waldemar Rymarkiewicz Signed-off-by: Gustavo F. Padovan commit 14b12d0b98f87162b7e9e93dde66d1af97886567 Author: Jaikumar Ganesh Date: Mon May 23 18:06:04 2011 -0700 Bluetooth: Add BT_POWER L2CAP socket option. Add BT_POWER socket option used to control the power characteristics of the underlying ACL link. When the remote end has put the link in sniff mode and the host stack wants to send data we need need to explicitly exit sniff mode to work well with certain devices (For example, A2DP on Plantronics Voyager 855). However, this causes problems with HID devices. Hence, moving into active mode when sending data, irrespective of who set the sniff mode has been made as a socket option. By default, we will move into active mode. HID devices can set the L2CAP socket option to prevent this from happening. Currently, this has been implemented for L2CAP sockets. This has been tested with incoming and outgoing L2CAP sockets for HID and A2DP. Based on discussions on linux-bluetooth and patches submitted by Andrei Emeltchenko. Signed-off-by: Jaikumar Ganesh Signed-off-by: Gustavo F. Padovan commit 96d97a673d42408c0f960cc54d44be7629343bce Author: Waldemar Rymarkiewicz Date: Wed Jun 1 17:28:48 2011 +0200 Bluetooth: Verify a pin code in pin_code_reply As we cannot relay on a userspace mgmt api implementation we should verify if pin_code_reply in fact contains the secure pin code. If userspace replied with unsecure pincode when secure was required we will send pin_code_neg_reply to the controller. Signed-off-by: Waldemar Rymarkiewicz Signed-off-by: Gustavo F. Padovan commit 24718ca5eeb6d36a4a78deb34a2d50e4017bbd4a Author: Waldemar Rymarkiewicz Date: Wed Jun 1 17:28:47 2011 +0200 Bluetooth: Remove a magic number Signed-off-by: Waldemar Rymarkiewicz Signed-off-by: Gustavo F. Padovan commit b5ad8b7f8c3f3711129d67aeda85ceec690c3cd0 Author: Johannes Berg Date: Wed Jun 1 08:54:45 2011 +0200 Bluetooth: fix sparse & gcc warnings sparse complains about a few things that should be static. Signed-off-by: Johannes Berg Signed-off-by: Gustavo F. Padovan commit 6d3ce0e7902314ddb330deaf8827205881d7e59f Author: Andre Guedes Date: Tue May 31 14:20:57 2011 -0300 Bluetooth: Set 'peer_addr_type' in hci_le_connect() Set the 'peer_addr_type' field of the LE Create Connection command sent in hci_le_connect(). Signed-off-by: Andre Guedes Acked-by: Ville Tervo Signed-off-by: Gustavo F. Padovan commit eda42b503a3c866d51146549fe46da1f5f64e2c7 Author: Andre Guedes Date: Tue May 31 14:20:56 2011 -0300 Bluetooth: Check advertising cache in hci_connect() When connecting to a LE device, we need to check the advertising cache in order to know the address type of that device. If its advertising entry is not found, the connection is not established and hci_connect() returns error. Signed-off-by: Andre Guedes Acked-by: Ville Tervo Signed-off-by: Gustavo F. Padovan commit 893d67514aebcfd3ebf17bd212ceea1e2741a443 Author: Andre Guedes Date: Tue May 31 14:20:55 2011 -0300 Bluetooth: Remove useless check in hci_connect() There is no need to check the connection's state since hci_conn_add() has just created a new connection and its state has been set properly. Signed-off-by: Andre Guedes Acked-by: Ville Tervo Signed-off-by: Gustavo F. Padovan commit 29b7988a23daf79c15d587ef9e98e64715aa1ea8 Author: Andre Guedes Date: Tue May 31 14:20:54 2011 -0300 Bluetooth: Add 'dst_type' field to struct hci_conn This patch adds a new field (dst_type) to the struct hci_conn which holds the type of the destination address (bdaddr_t dst). This approach is needed in order to use the struct hci_conn as an abstraction of LE connections in HCI Layer. For non-LE this field is ignored. This patch also set properly the 'dst_type' field after initializing LE hci_conn structures. Signed-off-by: Andre Guedes Signed-off-by: Gustavo F. Padovan commit d7556e20ade582a223ca1792e1f8a7bfd7d5d008 Author: Waldemar Rymarkiewicz Date: Tue May 31 15:49:26 2011 +0200 Bluetooth: Refactor hci_auth_complete_evt function Replace if(conn) with if(!conn) checking to avoid too many nested statements Signed-off-by: Waldemar Rymarkiewicz Signed-off-by: Gustavo F. Padovan commit 19f8def031bfa50c579149b200bfeeb919727b27 Author: Waldemar Rymarkiewicz Date: Tue May 31 15:49:25 2011 +0200 Bluetooth: Fix auth_complete_evt for legacy units Legacy devices don't re-authenticate the link properly if a link key already exists. Thus, don't update sec_level for this case even if hci_auth_complete_evt indicates success. Otherwise the sec_level will not reflect a real security on the link. Signed-off-by: Waldemar Rymarkiewicz Signed-off-by: Gustavo F. Padovan commit 3581508571b513ed2e66d71f9708d6be907460fd Author: Andre Guedes Date: Thu May 26 16:23:53 2011 -0300 Bluetooth: Advertising entries lifetime This patch adds a timer to clear 'adv_entries' after three minutes. After some amount of time, the advertising entries cached during the last LE scan should be considered expired and they should be removed from the advertising cache. It was chosen a three minutes timeout as an initial attempt. This value might change in future. Signed-off-by: Andre Guedes Signed-off-by: Gustavo F. Padovan commit eb9d91f5ae9c14583c49223e49f7e88f77b84749 Author: Andre Guedes Date: Thu May 26 16:23:52 2011 -0300 Bluetooth: Clear advertising cache before scanning The LE advertising cache should be cleared before performing a LE scanning. This will force the cache to contain only fresh advertising entries. Signed-off-by: Andre Guedes Signed-off-by: Gustavo F. Padovan commit 9aa04c9108164e62cf94d6913183817a0d3dbf03 Author: Andre Guedes Date: Thu May 26 16:23:51 2011 -0300 Bluetooth: Add Advertising Report Meta Event handler This patch adds a function to handle LE Advertising Report Meta Events. Signed-off-by: Andre Guedes Signed-off-by: Anderson Briglia Signed-off-by: Gustavo F. Padovan commit 76c8686f8871f1bcb2dc8b4c5311cd0e2f73d4cd Author: Andre Guedes Date: Thu May 26 16:23:50 2011 -0300 Bluetooth: LE advertising cache This patch implements the LE advertising cache. It stores sensitive information (bdaddr and bdaddr_type so far) gathered from LE advertising report events. Only advertising entries from connectables devices are added to the cache. Signed-off-by: Andre Guedes Signed-off-by: Gustavo F. Padovan commit 0f8527249646bbe75d036fe8b9b84d662ece90a9 Author: Gustavo F. Padovan Date: Wed May 4 19:42:50 2011 -0300 Bluetooth: Rename __l2cap_chan_close() to l2cap_chan_close() To make it consistent with the rest of the API. Signed-off-by: Gustavo F. Padovan commit 500698d3fd987f6c405d6d5f68fdf535a539e71e Author: Gustavo F. Padovan Date: Wed May 4 19:35:27 2011 -0300 Bluetooth: Remove export of l2cap_chan_clear_timer() The call to l2cap_chan_clear_timer() is not really needed in l2cap_sock.c. This patch also adds a call to l2cap_chan_clear_timer() to the only place in __l2cap_sock_close() that wasn't calling it. It's safe call it there because l2cap_chan_clear_timer() check first for timer_peding(). Signed-off-by: Gustavo F. Padovan commit ab07801d28985090ac38047b5a4d8952a7e1689f Author: Gustavo F. Padovan Date: Mon May 2 18:25:01 2011 -0300 Bluetooth: create channel timer to replace sk_timer The new timer does not belong to struct sock, tought it still touch some sock things, but this will be sorted out soon. Signed-off-by: Gustavo F. Padovan commit 715ec005cd10c5d53109ffe513e4d403644e3e48 Author: Gustavo F. Padovan Date: Mon May 2 17:13:55 2011 -0300 Bluetooth: Add chan->chan_type struct member chan_type says if our chan is raw(direclty access to HCI), connection less or connection oriented. Signed-off-by: Gustavo F. Padovan commit 9a91a04a95d30a18909e2aec9d7b17b4c86088a7 Author: Gustavo F. Padovan Date: Thu Apr 28 18:50:17 2011 -0300 Bluetooth: Create l2cap_chan_send() This move all the sending logic to l2cap_core.c, but we still have a socket dependence there, struct msghdr. It will be removed in some of the further commits. Signed-off-by: Gustavo F. Padovan commit 4519de9a0478d8de438f8b80ab2e94668ef63ab4 Author: Gustavo F. Padovan Date: Thu Apr 28 17:55:53 2011 -0300 Bluetooth: Create __l2cap_chan_close() This is actually __l2cap_sock_close() renamed to __l2cap_chan_close(). At a first look it may not make sense, but with the further cleanups that will come it will. Signed-off-by: Gustavo F. Padovan commit 37e1c55de7b1edd3fb8fc3411ad0c32a213723d0 Author: Johan Hedberg Date: Fri May 20 11:50:41 2011 -0700 Bluetooth: Remove unnecessary use of hci_dev_list_lock The get_connections function has no need to use hci_dev_list_lock. The code was there probably because of a copy-paste mistake. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 75fde9ee1bca0c0c004aadaebdedf17370f93f18 Author: David Miller Date: Thu May 19 18:09:00 2011 -0400 Bluetooth: Kill set but not used variable 'l2cap_sk' in rfcomm_sock_getsockopt_old() Signed-off-by: David S. Miller Signed-off-by: Gustavo F. Padovan commit 78676a06260a4162b6837a8a2fb954445004ebc2 Author: Gustavo F. Padovan Date: Wed May 18 18:14:45 2011 -0300 Bluetooth: fix set but not used warning Signed-off-by: Gustavo F. Padovan commit 224f8af0db1cd50e9d954ca9d5a7d7716f63d2b0 Author: Ruiyi Zhang Date: Fri May 13 13:07:52 2011 +0800 Bluetooth: Allow unsegmented SDU retries on sock_queue_rcv_skb failure In L2CAP_SDU_UNSEGMENTED case, if sock_queue_rcv_skb returns error, l2cap_ertm_reassembly_sdu should not return 0 so as to insert the skb into BUSY_QUEUE for later retries. Signed-off-by: Ruiyi Zhang Signed-off-by: Gustavo F. Padovan commit c0c33addcba2ce753b4e2746db99feaae2f82a85 Merge: ffbc03b 931749b Author: John W. Linville Date: Wed Jun 8 13:44:21 2011 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem commit 931749bf78b969c54de9bbc67cf29b13a40bb73b Author: Mohammed Shafi Shajakhan Date: Mon Jun 6 23:02:33 2011 +0530 ath9k: make use of a helper to get paprd scale factor Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 36cb7cce230a06378915d405cd33adf58dd5fe2a Author: Yogesh Ashok Powar Date: Mon Jun 6 14:54:17 2011 +0530 mwifiex: disable transmission buffer aggregation for AMSDU packets Padding per MSDU will affect the length of next packet and hence the exact length of next packet is uncertain here. Also, aggregation of transmission buffer, while downloading the data to the card, wont gain much on the AMSDU packets as the AMSDU packets utilizes the transmission buffer space to the maximum (adapter->tx_buf_size). Signed-off-by: Yogesh Ashok Powar Signed-off-by: John W. Linville commit fb3c19bc9687d972b83faf366b38ac807eca8f25 Author: Yogesh Ashok Powar Date: Mon Jun 6 14:53:02 2011 +0530 mwifiex: adding check for enough space before padding All MSDUs, except the last one in an AMSDU, should end up at 4 bytes boundary. There is need to check if enough skb_tailroom space exists before padding the skb. Also re-arranging code for better readablity. Signed-off-by: Yogesh Ashok Powar Signed-off-by: John W. Linville commit a8fe32937e4e55c9ed73c79800198d137a1b968a Author: Yogesh Ashok Powar Date: Mon Jun 6 14:50:58 2011 +0530 mwifiex: Remove redundant skb_queue_empty checks The check of skb list empty before calling skb_peek and skb_dequeue is redundant. These functions returns NULL if the list is empty. Signed-off-by: Yogesh Ashok Powar Signed-off-by: John W. Linville commit fcf2176c87af77e5ee947edaf8e390bc67b729d8 Author: Yogesh Ashok Powar Date: Mon Jun 6 14:49:32 2011 +0530 mwifiex: remove list traversal in mwifiex_num_pkts_in_txq Instead of counting the number of packets in txq for particular RA list before AMSDU creation, maintain a counter which will keep track of the same. This will reduce some MIPS while generating AMSDU traffic as we only have to check the counter instead of traversing through skb list. Signed-off-by: Yogesh Ashok Powar Signed-off-by: John W. Linville commit 485868266150022a139b74ba4daf0da9ad86c1c0 Author: Greg Dietsche Date: Sun Jun 5 19:30:11 2011 -0500 iwlwifi: remove unecessary if statement the code always returns ret regardless, so if(ret) check is unecessary. Signed-off-by: Greg Dietsche Signed-off-by: John W. Linville commit f973f87ec13e82256d45e11b204a8e3fb3808635 Author: Stanislaw Gruszka Date: Thu Jun 2 16:46:20 2011 +0200 iwlagn: refactor iwlagn_mac_channel_switch Use less indentions and remove uneeded irq-save flags. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 70559a06657c55aeefe2f06619d3592a08cc68ac Author: Shahar Levi Date: Sun May 22 16:10:22 2011 +0300 wl12xx: Stop BA session event from device Adding new event that close RX BA session in case of periodic BT activity limiting WLAN activity. Signed-off-by: Shahar Levi Signed-off-by: John W. Linville commit f41ccd71d800c6fac18d2b4ae1830a222c6713da Author: Shahar Levi Date: Sun May 22 16:10:21 2011 +0300 mac80211: Stop BA session event from device Some devices support BT/WLAN co-existence algorigthms. In order not to harm the system performance and user experience, the device requests not to allow any RX BA session and tear down existing RX BA sessions based on system constraints such as periodic BT activity that needs to limit WLAN activity (eg.SCO or A2DP). In such cases, the intention is to limit the duration of the RX PPDU and therefore prevent the peer device to use A-MPDU aggregation. Adding ieee80211_stop_rx_ba_session() callback that can be used by the driver to stop existing BA sessions. Signed-off-by: Shahar Levi Signed-off-by: John W. Linville commit 41bfce8edebbe9dc6ddc238a71f07fbe9ab46016 Merge: 805a3b8 51892db Author: John W. Linville Date: Tue Jun 7 14:07:11 2011 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit a6b7a407865aab9f849dd99a71072b7cd1175116 Author: Alexey Dobriyan Date: Mon Jun 6 10:43:46 2011 +0000 net: remove interrupt.h inclusion from netdevice.h * remove interrupt.g inclusion from netdevice.h -- not needed * fixup fallout, add interrupt.h and hardirq.h back where needed. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 6403eab143205a45a5493166ff8bf7e3646f4a77 Author: Joe Perches Date: Fri Jun 3 11:51:20 2011 +0000 drivers/net: Remove unnecessary semicolons Semicolons are not necessary after switch/while/for/if braces so remove them. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit f81c62242045fb7be0a124d8c2540af96d842fad Author: Joe Perches Date: Fri Jun 3 11:51:19 2011 +0000 net: Remove unnecessary semicolons Semicolons are not necessary after switch/while/for/if braces so remove them. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 805a3b810708db3261cc8c1183ffb2703a5ce243 Author: Wey-Yi Guy Date: Fri Jun 3 07:54:16 2011 -0700 iwlagn: call commit_rxon function directly No need to go though multiple levels of indirect call to send RXON command. Call it directly Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit e80d70e98b993a7ece93e29a408da4a7d57a4da2 Author: Wey-Yi Guy Date: Fri Jun 3 07:54:15 2011 -0700 iwlagn: direct call to post_scan function After driver split, no need to use function "ops" for post_scan. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit c2b821d7a59e5d6b53c906d0a8fecc68e2aee540 Author: Wey-Yi Guy Date: Fri Jun 3 07:54:14 2011 -0700 iwlagn: move all post scan functions in one place Both tx power and power save are being done after scan complete, move into post_scan function Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 15b3f3b006b42a678523cad989bfd60b76bf4403 Author: Wey-Yi Guy Date: Fri Jun 3 07:54:13 2011 -0700 iwlagn: set smps mode after assoc for 1000 device For some timing reason, 1000 device having problem to kick-in to aggregation without sending rxon assoc command. This is a W/A until find the real reason Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 88e9ba76bf906d8106d5f64856eba6e6d6777003 Author: Wey-Yi Guy Date: Fri Jun 3 07:54:12 2011 -0700 iwlagn: save the latest smps mode When change smps mode due to bt coex, save it Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 0c34861e7c66435ab0986509ec20055c402f29d8 Author: Greg Dietsche Date: Thu Jun 2 22:24:06 2011 -0500 iwlegacy: add missing null check lq_sta has other null checks in this function. assuming they are correct, this additional null check should be added too. Incorporating suggestion from Gustavo Padovan. Signed-off-by: Greg Dietsche Signed-off-by: John W. Linville commit 5c30c76ee616fffb47cbd9810bfd0a99ce4ddb38 Author: Greg Dietsche Date: Thu Jun 2 21:06:09 2011 -0500 iwlegacy: propagate error return value propogate the return value from iwl4965_get_tx_atten_grp instead of implicitly returning -EINVAL in the error case. Signed-off-by: Greg Dietsche Signed-off-by: John W. Linville commit 8e638188b2b84ef9bb9ccbb87b92dda9d0a77bcb Author: Greg Dietsche Date: Thu Jun 2 21:06:08 2011 -0500 iwlegacy: return -EINVAL instead of -1 Cleanup the code to return -EINVAL instead of -1 Signed-off-by: Greg Dietsche Signed-off-by: John W. Linville commit 04975f3fc390974059ad06ac4162db7a6668a18d Author: Greg Dietsche Date: Thu Jun 2 21:06:07 2011 -0500 iwlegacy: remove unecessary if statement the code always returns ret regardless, so if(ret) check is unecessary. Signed-off-by: Greg Dietsche Signed-off-by: John W. Linville commit e5a042ea30c1772df9ed3dbe1538520e091ad25f Author: Greg Dietsche Date: Thu Jun 2 21:06:06 2011 -0500 iwlegacy: remove unreachable code return; at the end of the function is unecessary. Signed-off-by: Greg Dietsche Signed-off-by: John W. Linville commit aa4e0141c1c1ca53c643eacc6a68f29ade5f77ba Author: Rafał Miłecki Date: Thu Jun 2 13:43:24 2011 +0200 b43: add BCMA 80211 core specific defines Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 3c65ab62c5869a9d6ce5d9c28f7042b0e7e57891 Author: Rafał Miłecki Date: Thu Jun 2 09:56:04 2011 +0200 b43: add an option to register BROKEN bcma driver It does nothing useful yet, so it is matched as BROKEN. For now this is just an option for b43, in future we may want to make b43 support SSB or BCMA (note: or, not xor). Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 4da909e7b572b561d8150f9d41b04bcfff386222 Author: Rafał Miłecki Date: Thu Jun 2 01:07:12 2011 +0200 b43: do not use SSB specific flags when calling core reset function Luckily the only flag we use when calling core reset is GMODE one. Thanks to that we can just switch to single bool and make function calls bus generic. Tested on my BCM4312 (LP-PHY) and early tested with BCM43224. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 5a6f78afdabeb8b8e0811547fb98813323abf888 Author: Felix Fietkau Date: Tue May 31 21:21:41 2011 +0200 ath9k: show excessive-retry MPDUs in debugfs Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit dabd3001f941e35c4afa2458ceb17e5170062189 Author: Mike McCormack Date: Tue May 31 08:50:24 2011 +0900 rtlwifi: Fix logic in rx_interrupt Should pass along packet if there's no CRC and no hardware error. Signed-off-by: Mike McCormack Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 71352b2318675cf6a3f54c02a33d91ac17af1626 Author: Mike McCormack Date: Tue May 31 08:50:07 2011 +0900 rtlwifi: Use write barrier when assigning ownership Make sure all updates to a descriptor are flushed to memory before assigning ownship to hardware. Signed-off-by: Mike McCormack Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit febc9fe5387ed37cb329563ae29d21b41c71a9dd Author: Mike McCormack Date: Tue May 31 08:49:51 2011 +0900 rtlwifi: Assign rx buffer ownership to hardware last Ownership of an rx buffer should only be given to the hardware after all other changes are written, otherwise there's a potential race. Signed-off-by: Mike McCormack Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 312d5479dcfaca2b8aa451201b5388fdb8c8684a Author: Mike McCormack Date: Tue May 31 08:49:36 2011 +0900 rtlwifi: Don't block interrupts in spinlocks Now power state transitions are not called from an interrupt context, there's no need to block interrupts. This code appears to block interrupts for too long, causing my trackpad to lose sync occasionally. Signed-off-by: Mike McCormack Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 67fc6052a49b781efbcfc138f3b68fe79ddd0c2f Author: Mike McCormack Date: Tue May 31 08:49:23 2011 +0900 rtlwifi: Run IPS leave work in a tasklet This removes the need to use IRQ safe spinlocks in many places. Signed-off-by: Mike McCormack Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 34ddb2077e5ced1a09a1dd2cbb82f807bfc5f88b Author: Mike McCormack Date: Tue May 31 08:49:07 2011 +0900 rtlwifi: Store loop index in local variable _rtl_pci_rx_interrupt uses rtlpci->rx_ring[rx_queue_idx].idx a few times, so store it in a separate variable. Signed-off-by: Mike McCormack Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit f2ea312cf4338ae187212e41b3dce97a666e3912 Author: Mike McCormack Date: Tue May 31 08:48:50 2011 +0900 rtlwifi: Remove set_rfpowerstate_inprogress set_rfpowerstate_inprogress is only set and never read so remove it. Signed-off-by: Mike McCormack Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 2e69167c32780b2228f294505d5bf742494c960f Author: Mike McCormack Date: Tue May 31 08:48:23 2011 +0900 rtlwifi: Synchronize IRQ after disabling it This make sure any IRQ handlers running on other CPUs complete. Signed-off-by: Mike McCormack Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit f35490f909b7d535ff7f2f1a7df59be8c2824931 Author: Johannes Berg Date: Thu Jun 2 19:38:43 2011 +0200 iwlagn: fix interface combinations My patch to advertise interface combinations worked by pure luck in the P2P case, but all other cases are broken. This is due to a dumb mistake in the code that checks what should be advertised, fix that. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 5bc9890ff114cdd39de8561610f6af3bb4b08cfb Author: Wey-Yi Guy Date: Fri May 27 08:40:32 2011 -0700 iwlagn: change log to better represent the state of aggregation process Multiple A-MPDU actions will received from mac80211 while setting up the aggregation queue, change the message log to better represent the states. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 5f88ac2d72a7f8e1cadab6d9cbc0fe1837cbcd7a Author: Wey-Yi Guy Date: Fri May 27 08:40:31 2011 -0700 iwlagn: change the logging level for aggregation enable check Aggregation will not enable if the traffic is lower than the threshold, this is not an error condition, so change the logging level. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 0fd095024b7bc023c7afac107732dac961ee690d Author: Johannes Berg Date: Fri May 27 08:40:30 2011 -0700 iwlagn: advertise interface combinations With this, iwlwifi will advertise the limits on concurrency of virtual interfaces. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 93cce6f0adff92238965eadb3c046db58552087b Author: Emmanuel Grumbach Date: Fri May 27 08:40:29 2011 -0700 iwlagn: free the ICT ISR when the request_irq failed Fix a memory leak in case request_irq fails. Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 2e5d04dad1934d97057cbecce59834f78dafc067 Author: Daniel Halperin Date: Fri May 27 08:40:28 2011 -0700 iwlwifi: disambiguate invalid DMA index warnings The exact same error message is used in three different functions in iwlagn. Add the function name to the error string to disambiguate where the error is coming from. Signed-off-by: Daniel Halperin Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 3d82b15608ad97627ced4d3bd42ae10297c2f87d Author: Emmanuel Grumbach Date: Fri May 27 08:40:27 2011 -0700 iwlagn: solve sparse warning Remove local variable that was shadowing another one sta_priv hasn't changed since the beginning of the function, so don't define another pointer with the same name to the same variable Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 2b9253d2a0439bd247d9384921ff23e7ac6bba52 Author: Johannes Berg Date: Fri May 27 08:40:26 2011 -0700 iwlagn: fix dual-mode RXON The PAN context has three states: disabled, disassociated and associated. It seems that wasn't quite as much of an issue in previous versions of the microcode, but now we really have to use all the three states properly. So add code to switch accordingly. Additionally, PAN parameters need to be sent differently and the timing for PAN RXON needs to be inbetween. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 5beaaf3756aef42f31747d81b0676c8ccf59c6c4 Author: Wey-Yi Guy Date: Fri May 27 08:40:25 2011 -0700 iwlagn: remove un-necessary tx power ops All agn devices use the same tx power function, remove the ops Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 891db88112b604db054d9575d200271ad97634a4 Author: Wey-Yi Guy Date: Fri May 27 08:40:24 2011 -0700 iwlagn: send tx power command if defer cause by RXON not match During channge channel, tx power will not send to uCode, the tx power command should send after scan complete. but should also can send after RXON command. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 180cdc79c2204d0abe15509689dde631290f6a95 Author: Luis R. Rodriguez Date: Fri May 27 07:24:02 2011 -0700 cfg80211: skip disabled channels on channel survey The channel survey information will be empy for disabled channels so simply discard those entries. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 84288044dc9a50d2c0b0f1a024d7cd87ab3dd131 Author: Mohammed Shafi Shajakhan Date: Thu May 26 11:41:13 2011 +0530 ath9k: better position PAPRD debug message the training power calculation indirectly depends on target power under some scenarios, unless we have a valid training power, the PAPRD frames won't be sent out. so when we get an invalid training power, its better to display them before returning back. Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 05c0be2f7f10404e5b3bc4105f9206096e9b8767 Author: Mohammed Shafi Shajakhan Date: Thu May 26 10:56:15 2011 +0530 ath9k: Add a debug entry to start/stop ANI this helps the user to start/stop ANI dynamically. Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 81168e509f06aa205b240c1804ec2b9b5add4772 Author: Fabrice Deyber Date: Tue May 24 08:44:35 2011 -0500 ath9k: Further fix for mesh beaconing This fix ensure the timers to be set at beacon interval boundaries. Without this change timers can be set improperly resulting in the absence of beacons. Signed-off-by: Fabrice Deyber Signed-off-by: John W. Linville commit b942471bfcda207a51379628379aa821216486e7 Author: Mohammed Shafi Shajakhan Date: Tue May 24 15:29:52 2011 +0530 ath9k: wake up chip before initializing PAPRD table In PAPRD table initialization path we do some register read, so make sure the chip is awake during that. Currently PAPRD is disabled. Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 049436b9804394e4d6caf7da5f3507bd8f4caa6e Author: Larry Finger Date: Mon May 23 20:38:52 2011 -0500 rtlwifi: rtl8192se: Synchronize IRQ after disabling it As suggested by Mike McCormack for rtl8192ce, make sure any IRQ handlers running on other CPUs complete. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 5111dd3e422d08435164fc6d405d849ff6421eec Author: Larry Finger Date: Mon May 23 20:37:31 2011 -0500 rtlwifi: rtl8192se: Use write barrier when assigning ownership As noted by Mike McCormack for rtl8192ce, make sure all updates to a descriptor are flushed to memory before assigning ownship to hardware. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 4a7f5db19c0d8783f700cb606597c4c7b1364db5 Author: Amitkumar Karwar Date: Mon May 23 18:00:17 2011 -0700 mwifiex: remove support for old chipsets W0/W1 For SD8787 A0/A1 chipsets we use the default firmware image file 'mrvl/sd8787_uapsta.bin'. So the chip rev id variable is removed. The global variable fw_name is moved to adapter structure so that we can support a different interface, such as PCIe, in future. Signed-off-by: Amitkumar Karwar Signed-off-by: Bing Zhao Signed-off-by: John W. Linville commit 0541ac4cb47a31f44bf841a4dade539395c146ee Author: Larry Finger Date: Sun May 22 20:57:03 2011 -0500 b43legacy: Fix warnings from gcc 4.6.0 gcc 4.6.0 warnings for b43legacy: CC [M] drivers/net/wireless/b43legacy/main.o drivers/net/wireless/b43legacy/main.c: In function ‘b43legacy_request_firmware’: drivers/net/wireless/b43legacy/main.c:1567:6: warning: variable ‘tmshigh’ set but not used [-Wunused-but-set-variable] drivers/net/wireless/b43legacy/main.c: In function ‘b43legacy_op_dev_config’: drivers/net/wireless/b43legacy/main.c:2637:6: warning: variable ‘antenna_rx’ set but not used [-Wunused-but-set-variable] drivers/net/wireless/b43legacy/main.c: In function ‘b43legacy_op_bss_info_changed’: drivers/net/wireless/b43legacy/main.c:2778:24: warning: variable ‘phy’ set but not used [-Wunused-but-set-variable] drivers/net/wireless/b43legacy/xmit.c: In function ‘generate_txhdr_fw3’: drivers/net/wireless/b43legacy/xmit.c:324:7: warning: variable ‘rts_rate_ofdm’ set but not used [-Wunused-but-set-variable] CC [M] drivers/net/wireless/b43legacy/dma.o drivers/net/wireless/b43legacy/dma.c: In function ‘free_all_descbuffers’: drivers/net/wireless/b43legacy/dma.c:820:36: warning: variable ‘desc’ set but not used [-Wunused-but-set-variable] drivers/net/wireless/b43legacy/dma.c: In function ‘b43legacy_dma_tx’: drivers/net/wireless/b43legacy/dma.c:1377:28: warning: variable ‘info’ set but not used [-Wunused-but-set-variable] drivers/net/wireless/b43legacy/dma.c:1374:24: warning: variable ‘hdr’ set but not used [-Wunused-but-set-variable] drivers/net/wireless/b43legacy/dma.c: In function ‘b43legacy_dma_handle_txstatus’: drivers/net/wireless/b43legacy/dma.c:1438:36: warning: variable ‘desc’ set but not used [-Wunused-but-set-variable] Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 78d57372cc781c69a97700cac1f181ec42433fca Author: Larry Finger Date: Sun May 22 20:54:43 2011 -0500 rtl8192se: Fix warnings from gcc 4.6.0 gcc 4.6.0 warnings for rtl8192se: CC [M] drivers/net/wireless/rtlwifi/rtl8192se/dm.o drivers/net/wireless/rtlwifi/rtl8192se/dm.c: In function ‘_rtl92s_dm_refresh_rateadaptive_mask’: drivers/net/wireless/rtlwifi/rtl8192se/dm.c:225:5: warning: variable ‘rssi_level’ set but not used [-Wunused-but-set-variable] CC [M] drivers/net/wireless/rtlwifi/rtl8192se/fw.o drivers/net/wireless/rtlwifi/rtl8192se/fw.c: In function ‘rtl92s_download_fw’: drivers/net/wireless/rtlwifi/rtl8192se/fw.c:361:6: warning: variable ‘file_length’ set but not used [-Wunused-but-set-variable] CC [M] drivers/net/wireless/rtlwifi/rtl8192se/hw.o drivers/net/wireless/rtlwifi/rtl8192se/hw.c: In function ‘_rtl92se_hw_configure’: drivers/net/wireless/rtlwifi/rtl8192se/hw.c:887:6: warning: variable ‘reg_ratr’ set but not used [-Wunused-but-set-variable] drivers/net/wireless/rtlwifi/rtl8192se/hw.c: In function ‘_rtl92se_set_media_status’: drivers/net/wireless/rtlwifi/rtl8192se/hw.c:1125:20: warning: variable ‘ledaction’ set but not used [-Wunused-but-set-variable] drivers/net/wireless/rtlwifi/rtl8192se/hw.c: In function ‘rtl92se_gpio_radio_on_off_checking’: drivers/net/wireless/rtlwifi/rtl8192se/hw.c:2274:32: warning: variable ‘cur_rfstate’ set but not used [-Wunused-but-set-variable] CC [M] drivers/net/wireless/rtlwifi/rtl8192se/phy.o drivers/net/wireless/rtlwifi/rtl8192se/phy.c: In function ‘rtl92s_phy_set_bw_mode’: drivers/net/wireless/rtlwifi/rtl8192se/phy.c:266:5: warning: variable ‘reg_prsr_rsc’ set but not used [-Wunused-but-set-variable] CC [M] drivers/net/wireless/rtlwifi/rtl8192se/trx.o drivers/net/wireless/rtlwifi/rtl8192se/trx.c: In function ‘_rtl92se_translate_rx_signal_stuff’: drivers/net/wireless/rtlwifi/rtl8192se/trx.c:584:6: warning: variable ‘psaddr’ set but not used [-Wunused-but-set-variable] Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 52722592b1702687bf24fe69d75f2ef97360fd59 Author: Larry Finger Date: Sun May 22 20:54:40 2011 -0500 rtl8192cu: Fix warnings from gcc 4.6.0 gcc 4.6.0 warnings for rtl8192cu: CC [M] drivers/net/wireless/rtlwifi/rtl8192cu/mac.o drivers/net/wireless/rtlwifi/rtl8192cu/mac.c: In function ‘rtl92c_translate_rx_signal_stuff’: drivers/net/wireless/rtlwifi/rtl8192cu/mac.c:1116:6: warning: variable ‘psaddr’ set but not used [-Wunused-but-set-variable] Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 6c0d4988c7dc23e5e8b22e99ab140e47c716848e Author: Larry Finger Date: Sun May 22 20:54:37 2011 -0500 rtl8192ce: Fix warnings from gcc 4.6.0 gcc 4.6.0 warnings for rtl8192ce: CC [M] drivers/net/wireless/rtlwifi/rtl8192ce/hw.o drivers/net/wireless/rtlwifi/rtl8192ce/hw.c: In function ‘_rtl92ce_hw_configure’: drivers/net/wireless/rtlwifi/rtl8192ce/hw.c:766:6: warning: variable ‘reg_ratr’ set but not used [-Wunused-but-set-variable] drivers/net/wireless/rtlwifi/rtl8192ce/hw.c: In function ‘rtl92ce_gpio_radio_on_off_checking’: drivers/net/wireless/rtlwifi/rtl8192ce/hw.c:1972:41: warning: variable ‘cur_rfstate’ set but not used [-Wunused-but-set-variable] CC [M] drivers/net/wireless/rtlwifi/rtl8192ce/phy.o drivers/net/wireless/rtlwifi/rtl8192ce/phy.c: In function ‘rtl92c_phy_config_rf_with_headerfile’: drivers/net/wireless/rtlwifi/rtl8192ce/phy.c:284:7: warning: variable ‘rtstatus’ set but not used [-Wunused-but-set-variable] CC [M] drivers/net/wireless/rtlwifi/rtl8192ce/trx.o drivers/net/wireless/rtlwifi/rtl8192ce/trx.c: In function ‘_rtl92ce_translate_rx_signal_stuff’: drivers/net/wireless/rtlwifi/rtl8192ce/trx.c:595:6: warning: variable ‘psaddr’ set but not used [-Wunused-but-set-variable] Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit c0fda68d00a72895c4ad0871c6f57074b0e4292c Author: Larry Finger Date: Sun May 22 20:54:34 2011 -0500 rtl8192c-common: Fix warnings from gcc 4.6.0 gcc 4.6.0 warnings for rtl8192c-common: CC [M] drivers/net/wireless/rtlwifi/rtl8192c/fw_common.o drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c: In function ‘_rtl92c_cmd_send_packet’: drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c:549:5: warning: variable ‘own’ set but not used [-Wunused-but-set-variable] CC [M] drivers/net/wireless/rtlwifi/rtl8192c/phy_common.o drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c: In function ‘_rtl92c_phy_iq_calibrate’: drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c:1256:6: warning: variable ‘bbvalue’ set but not used [-Wunused-but-set-variable] drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c: In function ‘rtl92c_phy_iq_calibrate’: drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c:1766:6: warning: variable ‘reg_ecc’ set but not used [-Wunused-but-set-variable] drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c:1765:34: warning: variable ‘reg_eac’ set but not used [-Wunused-but-set-variable] Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 19086fcef1de1fa7350d8122910a506481acf94b Author: Larry Finger Date: Sun May 22 20:54:31 2011 -0500 rtlwifi: Fix warnings from gcc 4.6.0 gcc 4.6.0 warnings for rtlwifi: CC [M] drivers/net/wireless/rtlwifi/base.o drivers/net/wireless/rtlwifi/base.c: In function ‘rtl_tx_agg_stop’: drivers/net/wireless/rtlwifi/base.c:891:23: warning: variable ‘tid_data’ set but not used [-Wunused-but-set-variable] drivers/net/wireless/rtlwifi/base.c: In function ‘rtl_tx_agg_oper’: drivers/net/wireless/rtlwifi/base.c:921:23: warning: variable ‘tid_data’ set but not used [-Wunused-but-set-variable] CC [M] drivers/net/wireless/rtlwifi/efuse.o drivers/net/wireless/rtlwifi/efuse.c: In function ‘efuse_pg_packet_write’: drivers/net/wireless/rtlwifi/efuse.c:928:24: warning: variable ‘dataempty’ set but not used [-Wunused-but-set-variable] drivers/net/wireless/rtlwifi/efuse.c: In function ‘efuse_get_current_size’: drivers/net/wireless/rtlwifi/efuse.c:1179:5: warning: variable ‘hoffset’ set but not used [-Wunused-but-set-variable] CC [M] drivers/net/wireless/rtlwifi/ps.o drivers/net/wireless/rtlwifi/ps.c: In function ‘rtl_ps_set_rf_state’: drivers/net/wireless/rtlwifi/ps.c:85:19: warning: variable ‘rtstate’ set but not used [-Wunused-but-set-variable] CC [M] drivers/net/wireless/rtlwifi/regd.o drivers/net/wireless/rtlwifi/regd.c: In function ‘_rtl_dump_channel_map’: drivers/net/wireless/rtlwifi/regd.c:310:28: warning: variable ‘ch’ set but not used [-Wunused-but-set-variable] CC [M] drivers/net/wireless/rtlwifi/usb.o drivers/net/wireless/rtlwifi/usb.c: In function ‘_rtl_usb_transmit’: drivers/net/wireless/rtlwifi/usb.c:826:21: warning: variable ‘urb_list’ set but not used [-Wunused-but-set-variable] drivers/net/wireless/rtlwifi/usb.c:825:23: warning: variable ‘skb_list’ set but not used [-Wunused-but-set-variable] Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 9c1cacd2c08ede12765e838c35b6d1e9eb900f60 Author: Larry Finger Date: Sun May 22 20:54:25 2011 -0500 b43: Fix warnings from gcc 4.6.0 gcc 4.6.0 warnings for b43: CC [M] drivers/net/wireless/b43/lo.o drivers/net/wireless/b43/lo.c: In function ‘lo_measure_gain_values’: drivers/net/wireless/b43/lo.c:304:7: warning: variable ‘trsw_rx’ set but not used [-Wunused-but-set-variable] CC [M] drivers/net/wireless/b43/dma.o drivers/net/wireless/b43/dma.c: In function ‘free_all_descbuffers’: drivers/net/wireless/b43/dma.c:760:30: warning: variable ‘desc’ set but not used [-Wunused-but-set-variable] drivers/net/wireless/b43/dma.c: In function ‘b43_dma_handle_txstatus’: drivers/net/wireless/b43/dma.c:1391:30: warning: variable ‘desc’ set but not used [-Wunused-but-set-variable] Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 24f7580e852b5472b51eea322bb78454df0054b8 Author: Zefir Kurtisi Date: Fri May 20 20:29:17 2011 +0200 minstrel_ht: fixed rate mode through debugfs Found several threads about fixed rate mode in minstrel_ht for test environments, but no patches for it. This patch provides such a mode through debugfs. Signed-off-by: John W. Linville commit 71063f0e8939b5b6ea5121faed47987e094ef018 Author: Wey-Yi Guy Date: Fri May 20 09:05:54 2011 -0700 nl80211: add testmode dump support This adds dump support to testmode. The testmode dump support in nl80211 requires using two of the six cb->args, the rest can be used by the driver to figure out where the dump position is at or to store other data across invocations. Signed-off-by: Wey-Yi Guy Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 2e5ef4599addb1046086b63743f41822858a23b7 Author: Rajkumar Manoharan Date: Fri May 20 17:52:12 2011 +0530 ath9k: Handle IBSS status changes in BSS_CHANGED_IBSS Configure ibss node's bss_changes under BSS_CHANGED_IBSS. And also start/stop ani timer only if the station join/leave the group. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit f29f5c0882bdd58c42b8176ee0b578f92589fda2 Author: Rajkumar Manoharan Date: Fri May 20 17:52:11 2011 +0530 ath9k: Remove ATH9K_BEACON_PERIOD mask Earlier beacon_interval is used to hold interval value and some flags (ATH9K_BEACON_ENA &ATH9K_BEACON_PERIOD). So to extract interval ATH9K_BEACON_PERIOD is used. Those flags were completely removed. So masking beacon_interval is not required. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 505fb019d4924e425bb1024eb603a7bc7fe7fe63 Author: Rafał Miłecki Date: Thu May 19 15:11:27 2011 +0200 b43: bus: add helpers for checking host type Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d48ae5c826f9af7d8b39867887d48e2a6f47af1f Author: Rafał Miłecki Date: Thu May 19 15:11:26 2011 +0200 b43: use new pointers path to access ssb_device in SSB specific places Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 02a0fbe4dcb4c318d09d97b19e51f48ba6d36ede Author: Rafał Miłecki Date: Thu May 19 15:11:25 2011 +0200 b43: SDIO: use new pointers path to access ssb_device SDIO code is SSB specific, we can safely just use "sdev" Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 6ac53692179da165b2cb1e2a122b0ed9dad9b9ad Author: Rafał Miłecki Date: Thu May 19 15:11:24 2011 +0200 b43: LP-PHY: use new pointers path to access ssb_device LP-PHY code is SSB specific, add check for bus type. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 5595f119649b3178c03479baa794113b8533158a Author: Mohammed Shafi Shajakhan Date: Thu May 19 18:08:57 2011 +0530 ath9k: mark few functions as static Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 6d79cb4ca3ff212984c1f9751accf2f033163be9 Author: Mohammed Shafi Shajakhan Date: Thu May 19 17:40:46 2011 +0530 ath9k: make ath9k_setpower function as static Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 33e6ef4e82f1de4f9a98a86633412390a322e2e8 Author: Felix Fietkau Date: Thu May 19 12:20:26 2011 +0200 ath9k_hw: remove ath9k_hw_get_desc_link Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit fce041beb03f93c7a771f0b4b6c45bb71ef90901 Author: Felix Fietkau Date: Thu May 19 12:20:25 2011 +0200 ath9k: unify edma and non-edma tx code, improve tx fifo handling EDMA based chips (AR9380+) have 8 Tx FIFO slots, which are used to fix the tx queue start/stop race conditions which have to be worked around for earlier chips by keeping the last descriptor in the queue. The current code stores all frames that do not fit onto the 8 FIFO slots in a separate list. Whenever a FIFO slot is freed up, the next frame (or A-MPDU) from the pending queue gets moved to that slot. This process is not only inefficient, but also unnecessary. The code can be improved visibly by keeping the pending queue fully linked, and moving the contents of the entire queue to a FIFO slot as it becomes available. This patch makes the necessary changes for that and also merges some code that was duplicated for EDMA vs non-EDMA. It changes txq->axq_link to point to the last descriptor instead of the link pointer, so that ath9k_hw_set_desc_link can be used, which works on all chips. With this patch, a small performance increase for non-aggregated traffic was observed on AR9380 based embedded hardware. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit e62ddec94a1e11ab1043b607e20ae0d142069132 Author: Mohammed Shafi Shajakhan Date: Thu May 19 15:05:46 2011 +0530 ath9k: remove redundant if check Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 7882513bacb176ab4aacceefdd035ca9479da4fb Author: Javier Lopez Date: Wed Jun 1 11:26:13 2011 +0200 mac80211_hwsim driver support userspace frame tx/rx This patch adds to mac80211_hwsim the capability to send traffic via userspace. Frame exchange between kernel and user spaces is done through generic netlink communication protocol. A new generic netlink family MAC80211_HWSIM is proposed, this family contains three basic commands HWSIM_CMD_REGISTER, which is the command used to register a new traffic listener, HWSIM_CMD_FRAME, to exchange the frames from kernel to user and vice-versa, and HWSIM_CMD_TX_INFO_FRAME which returns from user all the information about retransmissions, rates, rx signal, and so on. How it works: Once the driver is loaded the MAC80211_HWSIM family will be registered. In the absence of userspace daemon, the driver itselfs implements a perfect wireless medium as it did in the past. When a daemon sends a HWSIM_CMD_REGISTER command, the module stores the application PID, and from this moment all frames will be sent to the registered daemon. The user space application will be in charge of process/forward all frames broadcast by any mac80211_hwsim radio. If the user application is stopped, the kernel module will detect the release of the socket and it will switch back to in-kernel perfect channel simulation. The userspace daemon must be waiting for incoming HWSIM_CMD_FRAME commands sent from kernel, for each HWSIM_CMD_FRAME command the application will try to broadcast this frame to all mac80211_hwsim radios, however the application may decide to forward/drop this frame. In the case of forwarding the frame, a new HWSIM_CMD_FRAME command will be created, all necessary attributes will be populated and the frame will be sent back to the kernel. Also after the frame broadcast phase, a HWSIM_CMD_TX_INFO_FRAME command will be sent from userspace to kernel, this command contains all the information regarding the transmission, such as number of tries, rates, ack signal, etc. You can find the actual implementation of wireless mediumd daemon (wmediumd) at: * Last version tarball: https://github.com/jlopex/cozybit/tarball/master * Or visiting my github tree: https://github.com/jlopex/cozybit/tree Signed-off-by: Javier Lopez Signed-off-by: John W. Linville commit 0f93c79404e1eaa5207f6d8a7aea14119808d382 Author: Gertjan van Wingerde Date: Wed May 18 20:26:04 2011 +0200 rt2x00: Enabled rt35xx device support by default. Now that support for these devices has been added we can enable them by default and remove the Kconfig not on support for these devices to be non-functional. Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 8f66bbb5248c59b69b521b35e097ffa6cad07f01 Author: Gertjan van Wingerde Date: Wed May 18 20:25:49 2011 +0200 rt2x00: Move rt2800_txdone and rt2800_txdone_entry_check to rt2800usb. These two functions are only used by rt2800usb so they don't have to be in rt2800lib. Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 798eefde3097f218849194f1abda1f179a169cc2 Author: Gertjan van Wingerde Date: Wed May 18 20:25:42 2011 +0200 rt2x00: Interface sequence lock doesn't have to disable interrupts. This lock is only used in the TX path and thus in process context. Therefore we can use a much lighter spinlock variant. Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 872834dfb38edc6f72cfc783a5ce78f2a9f36ec5 Author: Gertjan van Wingerde Date: Wed May 18 20:25:31 2011 +0200 rt2x00: Add support for RT3572/RT3592/RT3592+Bluetooth combo card (based on an earlier patch submitted by Shiang) Add support for RT3572/RT3592/RT3592+Bluetooth combo card Signed-off-by: Shiang Tu Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 8f96e91fa53761fd63dceedac6bbe4b39e5c5072 Author: Gertjan van Wingerde Date: Wed May 18 20:25:18 2011 +0200 rt2x00: Don't disable G0 PA_PE bit in case of BT coexistence. (split off from the earlier RT35xx patch submitted by Shiang) Signed-off-by: Shiang Tu Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 65f31b5e7029e55d4f7020a1d0b0658a50ea73cb Author: Gertjan van Wingerde Date: Wed May 18 20:25:05 2011 +0200 rt2x00: Enable PA_PE bits in TX_PIN_CFG according to active band. (split off from the earlier RT35xx patch submitted by Shiang) There's no point in enabling the PA_PE bits for the bands that we are not active on. Signed-off-by: Shiang Tu Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 24ca39d67968c42d377abc122f6dca635ebcdb79 Author: Rafał Miłecki Date: Wed May 18 02:06:43 2011 +0200 b43: bus: abstract bus and core operations Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 79d2232fed23e8e0d1b11abe2f9b78fb09084506 Author: Rafał Miłecki Date: Wed May 18 02:06:42 2011 +0200 b43: bus: abstract board info Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit c244e08c7aa30abea3c29ff17a40f4b0a58a7913 Author: Rafał Miłecki Date: Wed May 18 02:06:41 2011 +0200 b43: bus: abstract chip info Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit a18c715e63505850edd2b69ded5373d6d464cd80 Author: Rafał Miłecki Date: Wed May 18 02:06:40 2011 +0200 b43: bus: abstract device structs and irq Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 0581483afe1a6f90f828b36111b05a70c162137d Author: Rafał Miłecki Date: Wed May 18 02:06:39 2011 +0200 b43: bus: abstract SPROM SPROM is another frequently used struct. We decided to share SPROM struct between ssb na bcma as long as we will not need any hacks. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 21d889d433eb962b70ad88d554a4a7658067596f Author: Rafał Miłecki Date: Wed May 18 02:06:38 2011 +0200 b43: bus: abstract 80211 core info Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit c0b4c00907c7f611ef328de73967d7913e137df8 Author: Rafał Miłecki Date: Wed May 18 02:06:37 2011 +0200 b43: bus: abstract R/W operations Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 482f05386218a028309a71ad36066ee64b7a820d Author: Rafał Miłecki Date: Wed May 18 02:06:36 2011 +0200 b43: add bus device abstraction layer Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit aa63418aa72e4468838eea457a123057b1c7cd11 Author: Rafał Miłecki Date: Wed May 18 02:06:35 2011 +0200 b43: rename ssb_device variable in ssb specific functions Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit e11ec900cfbea3d8f6a188674ee6fcb65f2a73d6 Merge: e12ca23 948252c Author: David S. Miller Date: Tue May 31 20:30:39 2011 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6