summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)AuthorFilesLines
2011-11-22Merge branch 'master' of ↵John W. Linville2752-49333/+149769
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux Conflicts: drivers/net/wireless/iwlegacy/iwl-debugfs.c drivers/net/wireless/iwlegacy/iwl-rx.c drivers/net/wireless/iwlegacy/iwl-scan.c drivers/net/wireless/iwlegacy/iwl-tx.c include/net/bluetooth/bluetooth.h
2011-11-22carl9170: use ieee80211_free_txskbChristian Lamparter1-2/+2
In the past, it was fine to simply call dev_kfree_skb when it was impossible to transmit a skb. However, with the new tx status API: "mac80211: implement wifi TX status" Every loose skb needs to be handed back to mac80211. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22p54: use ieee80211_free_txskbChristian Lamparter1-2/+2
In the past, it was fine to simply call dev_kfree_skb when it was impossible to transmit a skb. However, with the new tx status API: "mac80211: implement wifi TX status" Every loose skb needs to be handed back to mac80211. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22rndis_wlan: remove unused macroJussi Kivilinna1-2/+0
NET_TYPE_11FB actually has never been used. Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22rndis_wlan: add reporting of PMKSA candidate eventsJussi Kivilinna1-17/+9
Convert old WEXT reporting to use new cfg80211_pmksa_candidate_notify(). Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22rndis_wlan: add missing __packedJussi Kivilinna1-2/+2
Some structures were missing __packed. Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22rndis_wlan: pass channel info to cfg80211_roamed()Jussi Kivilinna1-2/+3
cfg80211_roamed() now has channel parameter so add passing current channel info. Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22rndis_wlan: split getting current channel to separate functionJussi Kivilinna1-18/+31
Split getting current channel channel from hardware to separate function as this function will be needed later in patch 'pass channel info to cfg80211_roamed()'. Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22cfg80211: add flags for off-channel capabilitiesJohannes Berg1-1/+2
Currently mac80211 implements these for all devices, but given restrictions of some devices that isn't really true, so prepare for being able to remove the capability for some mac80211 devices. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Acked-by: Kalle Valo <kvalo@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22iwl-debug: Shrink object by using dev_err and deduplicating formatsJoe Perches1-16/+21
Using dev_err instead of dev_printk(KERN_ERR uses fewer arguments and is a bit smaller. Deduplicating formats used by IWL_DEBUG_QUIET_RFKILL also makes the object a bit smaller. Neatened the macros, used ##__VA_ARGS__. $ size drivers/net/wireless/iwlwifi/built-in.o* text data bss dec hex filename 462652 8646 92576 563874 89aa2 drivers/net/wireless/iwlwifi/built-in.o.new 467557 8646 92592 568795 8addb drivers/net/wireless/iwlwifi/built-in.o.old Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22iwlwifi: remove redundancyWey-Yi Guy1-1/+1
just use iwl_bus, remove the redundancy Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22iwlwifi: tid_data is taken twice in iwl_trans_pcie_tx_agg_allocEmmanuel Grumbach1-1/+0
Remove this redundancy. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22iwlwifi: fix endianity issues in debug printsEmmanuel Grumbach1-4/+2
Use the CPUed version of the variables when printing data from the BA notification. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22iwlwifi: improve the prints in the reclaim pathEmmanuel Grumbach4-6/+9
Some information was redundation, other was missing. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22iwlwifi: check the HW when a queue is stuckEmmanuel Grumbach1-1/+5
Add more information when a queue is stuck and actually get information from the scheduler instead of looking at internal variables. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22brcm80211: smac: Use kmemdup rather than duplicating its implementationThomas Meyer1-2/+1
The semantic patch that makes this change is available in scripts/coccinelle/api/memdup.cocci. Signed-off-by: Thomas Meyer <thomas@m3y3r.de> Acked-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22rtlwifi: Remove redundant code from PCI interruptLarry Finger1-3/+0
The interrupt routine for PCI devices has a special exit that executes the same instructions as does the normal exit. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22rtlwifi: rtl8192cu: Fix endianian issuesLarry Finger7-36/+43
Driver rtlwifi fails on a big-endian host. These changes have been tested on a Mac PowerBook G4, which has a PPC processor. Although this patch touches some of the code that will affect endian issues on PCI hardware through drivers rtl8192ce, rtl8192se, and rtl8192de, these have not been tested due to lack of suitable hardware. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22rtlwifi: rtl8192cu: Change firmware upload to use block writesLarry Finger5-3/+64
Driver rtl8192cu writes the firmware with 32-bit asynchronous writes. This design is OK for USB 2.0 adapters, but the current implementation of xhcu-hcd has a limited ring size, which is exceeded. By converting to synchronous block writes, this error is avoided. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22rtlwifi: rtl8192cu: Allow retries for USB I/OGeorge2-4/+16
The USB driver does not retry reads - allow 10 tries. Signed-off-by: George <george0505@realtek.com> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22ath9k: trivial: reorder rx_tasklet processingZefir Kurtisi1-5/+5
DFS events are reported as PHY errors and need to be processed with a correct timestamp set before ath9k_skb_preprocess() is called and the frame is possibly dropped. This patch puts the rxs->mactime calculation before the skb is preprocessed to prepare for DFS event reporting. Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-22Merge branch 'for-linville' of git://github.com/sgruszka/iwlegacyJohn W. Linville70-36234/+34525
2011-11-18mwifiex: add support for Marvell sd8797 deviceBing Zhao8-20/+50
This patch supports Marvell chipset 88W8797 (Avastar) with SDIO interface. The corresponding firmware image file is located at: "mrvl/sd8797_uapsta.bin" Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: Tristan Xu <xurf@marvell.com> Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Kiran Divekar <dkiran@marvell.com> Signed-off-by: Frank Huang <frankh@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-18p54spi: Remove FIXME in op_stopMichael Büsch1-5/+1
Don't use the interruptible variant of mutex_lock(). It doesn't really need to be interruptible. This avoids nasty error handling. Signed-off-by: Michael Buesch <m@bues.ch> Acked-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-18wireless: use strlcpy routine in .get_drvinfoRick Jones5-13/+16
Convert various seemingly still compiled wireless drivers' .get_drvinfo routines to use the preferred strlcpy() routine. Signed-off-by: Rick Jones <rick.jones2@hp.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-18brcmsmac: Use current logging stylesJoe Perches2-79/+80
Add and use pr_fmt and pr_<level> Remove useless double parentheses from macros. Remove function names from format strings, add to pr_debug use. Coalesce formats. Remove uncompileable undeclared variable in a DMA_NONE use. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-18ath9k_hw: set btcoex weights for AR9462Rajkumar Manoharan3-4/+37
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-18ath9k_hw: Cleanup btcoex wlan weightsRajkumar Manoharan4-58/+34
Remove all wlan weight macros and group it together for better understanding & readability. It makes the code reusable for AR9462 wlan weights. Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-18ath9k: Remove enabling btcoex from stomp type changeRajkumar Manoharan3-4/+4
This patch removes btcoex_enable from stomp type change and let it be called from callee functions that makes the code can be reusable for MCI changes. Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-18Merge branch 'for-linville' of git://github.com/kvalo/ath6klJohn W. Linville22-2160/+4338
2011-11-16iwlegacy: debugfs_ops should depend on CONFIG_IWLEGACY_DEBUGFSGreg Dietsche5-42/+8
Only setup structs related to debugfs_ops when CONFIG_IWLEGACY_DEBUGFS is set. Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-16iwlegacy: 4965-rs: cleanup il4965_rs_sta_dbgfs_rate_scale_data_readGreg Dietsche1-7/+1
1) remove ret local var and return the result directly 2) remove il since it is not used Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-16iwlegacy: 4965-rs: don't return rate from il4965_rs_update_rate_tblGreg Dietsche1-9/+3
1) don't return rate from il4965_rs_update_rate_tbl 2) fix up il4965_rs_rate_scale_perform Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-16iwlegacy: 4965-rs: il4965_rs_alloc_sta: remove lq_sta local varGreg Dietsche1-4/+1
remove the lq_sta local variable and return the result directly in il4965_rs_alloc_sta Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-16iwlegacy: 4965-rs: remove unnecessary null check for sta and lq_staGreg Dietsche1-3/+0
both sta and lq_sta are guaranteed to be not null in the calling function so we don't need to check them here. Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-16iwlegacy: 4965-rs: remove null check on sta in il4965_rs_tx_statusGreg Dietsche1-1/+1
the null check on sta in il4965_rs_tx_status is not necessary Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-16iwlegacy: 4965: remove vif null check in request_scanGreg Dietsche1-2/+1
remove null check on vif in il4965_request_scan Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15Merge branch 'iommu/fixes' of ↵Linus Torvalds2-0/+2
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu * 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: iommu: omap: Fix compile failure
2011-11-15Merge branch 'fixes' of git://git.linaro.org/people/triad/linux-pinctrlLinus Torvalds1-15/+7
* 'fixes' of git://git.linaro.org/people/triad/linux-pinctrl: pinctrl: hide subsystem from the populace pinctrl: fix "warning: 'struct pinctrl_dev' declared inside parameter list"
2011-11-15Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2-32/+38
* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6: gpio: pca953x: propagate the errno from the chip_init functions gpio: pca953x: remove unneeded check for chip type gpio/omap: check return value from irq_alloc_generic_chip gpio/omap: replace MOD_REG_BIT macro with static inline
2011-11-15iwlegacy: remove unused IL_AC_UNSET defineStanislaw Gruszka1-2/+0
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: change IL_ERR to D_HT in iwl4965_rs_tl_turn_on_agg_for_tidGreg Dietsche1-4/+4
This message should be a debug message and not an error. Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: change IL_WARN to D_HT in il4965_tx_agg_startGreg Dietsche1-1/+1
This message should be a debug message and not a warning. Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: checkpatch.pl fixesStanislaw Gruszka14-411/+297
Fix most checkpatch.pl ERRORs and some WARNINGs. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: indentions and whitespacesStanislaw Gruszka17-6456/+6439
Process iwlegacy source files using: indent -npro -l500 -nhnl indent -npro -kr -i8 -ts8 -sob -l80 -nbbo -ss -ncs -cp1 -il0 -psl Plus manual compilation fixes. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: merge iwl-debug.h into common.hStanislaw Gruszka7-209/+165
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: rename iwl-debug.c to debug.cStanislaw Gruszka2-1/+1
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: merge iwl-fh.h into 4965.hStanislaw Gruszka2-418/+351
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: use FH49_ prefix in 4965 codeStanislaw Gruszka4-153/+153
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: use FH39_ prefix in 3945 codeStanislaw Gruszka2-3/+3
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>