aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/rtlwifi
AgeCommit message (Collapse)AuthorFilesLines
2011-07-11Merge branch 'master' of ↵John W. Linville1-0/+1
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
2011-07-08Merge branch 'master' of ↵John W. Linville10-57/+35
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
2011-07-05rtlwifi: rtl8192de: Fix error exit from hw_initLarry Finger1-1/+6
In routine rtl92de_hw_init(), there are two places where a failure is not handled correctly. Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-07-05rtlwifi: rtl8192de: Replace loops calling udelay with single mdelayLarry Finger1-13/+7
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 <[email protected]>. Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-07-05rtlwifi: rtl8192de: Remove comparison of boolean with trueLarry Finger4-17/+17
Tests of a boolean against "true" are not needed as non-zero is sufficient.. Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-07-05rtlwifi: rtl8192{ce,cu,se} Remove irq_enabledMike McCormack5-19/+0
This should be unnecessary if synchronize_irq is used. Signed-off-by: Mike McCormack <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-07-05rtlwifi: rtl8192de: Remove irq_enabled booleanLarry Finger1-2/+0
Prepare rtl8192de for the removal of irq_enaqbled. Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-07-05drivers/net/wireless/rtlwifi/rtl8192de/phy.c: fix udelay() usageAndrew Morton1-5/+5
ERROR: "__bad_udelay" [drivers/net/wireless/rtlwifi/rtl8192de/rtl8192de.ko] undefined! Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-07-05rtlwifi: rtl8192cu: Add new USB ID for Netgear WNA1000MYoann DI-RUZZA1-0/+1
Signed-off-by: Yoann DI-RUZZA <[email protected]> Signed-off-by: Larry Finger <[email protected]> Cc: Stable <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-30Merge branch 'master' of ↵John W. Linville28-22/+15359
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
2011-06-29rtlwifi: potential forever loop in rtl92de_hw_init()Dan Carpenter1-1/+2
"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 <[email protected]> Acked-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-29rtlwifi: rtl8192de: Fix build errors when using allyes configurationLarry Finger6-101/+101
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 <[email protected]> Signed-off-by: Larry Finger <[email protected]> Acked-by: Stephen Rothwell <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-29rtlwifi: use PCI_VENDOR_ID_*Jon Mason2-10/+4
Use PCI_VENDOR_ID_* from pci_ids.h instead of creating #define locally. Signed-off-by: Jon Mason <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-29rtlwifi: remove unnecessary read of PCI_CAP_ID_EXPJon Mason2-6/+1
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 <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-28Merge branch 'master' of ↵John W. Linville2-1/+32
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-tx.c
2011-06-27rtlwifi: rtl8192de: Modify Kconfig and Makefile routines for new driverChaoming Li3-2/+28
Set up Kconfig and Makefile for new driver for RTL8192DE. Signed-off-by: Chaoming_Li <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-27rtlwifi: Fix build problems introduced by merging rtl8192deLarry Finger2-3/+2
These patches allow compilation of rtlwifi, rtl8192c_common, rtl8192ce, rtl8192cu and rtl8192se to compile after rtl8192de was added. Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-27rtlwifi: rtl8192de: Merge TX and RX routinesChaoming Li2-0/+1715
Merge routines trx.c and trx.h for RTL8192DE. Signed-off-by: Chaoming_Li <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-27rtlwifi: rtl8192de: Merge table routinesChaoming Li2-0/+1747
Merge routines table.c and table.h for RTL8192DE. Signed-off-by: Chaoming_Li <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-27rtlwifi: rtl8192de: Merge main (sw) routinesChaoming Li2-0/+460
Merge routines sw.c and sw.h for RTL8192SE. Signed-off-by: Chaoming_Li <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-27rtlwifi: rtl8192de: Merge rf routinesChaoming Li2-0/+672
Merge routines rf.c and rf.h for RTL8192DE. Signed-off-by: Chaoming_Li <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-27rtlwifi: rtl8192de: Merge register definitionsChaoming Li1-0/+1313
Merge routines reg.h for RTL8192DE. Signed-off-by: Chaoming_Li <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-27rtlwifi: rtl8192de: Merge phy routinesChaoming Li2-0/+4015
Merge routines phy.c and phy.h for RTL8192DE. Signed-off-by: Chaoming_Li <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-27rtlwifi: rtl8192de: Merge led routinesChaoming Li2-0/+197
Merge routines led.c and led.h for RTL8192DE. Signed-off-by: Chaoming_Li <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-27rtlwifi: rtl8192de: Merge hardware routinesChaoming Li2-0/+2391
Merge routines hw.c and hw.h for RTL8192DE. Signed-off-by: Chaoming_Li <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-27rtlwifi: rtl8192de: Merge firmware routinesChaoming Li2-0/+945
Merge routines fw.c and fw.h for RTL8192DE. Signed-off-by: Chaoming_Li <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-27rtlwifi: rtl8192de: Merge dynamic management routinesChaoming Li2-0/+1567
Merge routines dm.c and dm.h for RTL8192DE. Signed-off-by: Larry Finger <[email protected]> Signed-off-by: Chaoming_Li <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-27rtlwifi: rtl8192de: Merge def.hChaoming Li1-0/+269
Introduce routine def.h for rtl8192de. Signed-off-by: Chaoming_Li <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-24Merge branch 'for-davem' of ↵David S. Miller25-222/+149
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
2011-06-24net: Remove unneeded version.h includes from drivers/net/Jesper Juhl1-1/+0
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-06-22rtl8192cu: Fix missing firmware loadLarry Finger1-0/+20
In commit 3ac5e26a1e935469a8bdae1d624bc3b59d1fcdc5 entitled "rtlwifi: rtl8192c-common: Change common firmware routines for addition of rtl8192se and rtl8192de", the firmware loading code was moved. Unfortunately, some necessary code was dropped for rtl8192cu. The dmesg output shows the following: rtl8192c: Loading firmware file rtlwifi/rtl8192cufw.bin rtl8192c_common:_rtl92c_fw_free_to_go():<0-0> Polling FW ready fail!! REG_MCUFWDL:0x00000006 . rtl8192c_common:rtl92c_download_fw():<0-0> Firmware is not ready to run! In addition, the interface will authenticate and associate, but cannot transfer data. This is reported as Kernel Bug #38012. Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-20Merge branch 'master' of ↵David S. Miller1-15/+13
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
2011-06-20rtlwifi: rtl8192{c,ce,cu,se}: Remove comparisons of booleans with trueMike McCormack20-38/+38
These are a potential source of confusion, as most C code treats all non-zero values as true. Signed-off-by: Mike McCormack <[email protected]> Acked-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-20rtlwifi: rtl8192cu: Remove unused parameterMike McCormack3-62/+7
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 <[email protected]> Acked-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-20rtlwifi: Fix typo in variable nameMike McCormack3-4/+4
offchan_deley should be offchan_delay Signed-off-by: Mike McCormack <[email protected]> Acked-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-20rtlwifi: include mac80211.h from core.hKalle Valo1-0/+2
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 <[email protected]> Signed-off-by: Kalle Valo <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-20rtlwifi: rtl8192se: Handle duplicate PCI ID 0x10ec:0x8192 conflict with ↵Larry Finger1-1/+12
r8192e_pci There are two devices with PCI ID 0x10ec:0x8192, namely RTL8192E and RTL8192SE. The method of distinguishing them is by the revision ID at offset 0x8 of the PCI configuration space. If the value is 0x10, then the device uses rtl8192se for a driver. Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-10rtlwifi: Fix warnings on parisc archLarry Finger6-11/+7
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 <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-10rtlwifi: Factor out code to receive one packetMike McCormack1-48/+51
Signed-off-by: Mike McCormack <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-10rtlwifi: Free skb in one placeMike McCormack1-5/+3
Signed-off-by: Mike McCormack <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-10rtlwifi: Resubmit skbs with bad CRC earlyMike McCormack1-42/+39
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 <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-10rtlwifi: Remove unnecessary indentMike McCormack1-95/+81
Signed-off-by: Mike McCormack <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-10Merge branch 'master' of ↵John W. Linville1-15/+13
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
2011-06-07rtlwifi: Avoid modifying skbs that are resubmittedMike McCormack1-15/+13
In the case we fail to allocate a new skb, the old skb should be resubmitted unmodified. Fixes bug introduced in a9e12869758430424804. Signed-off-by: Mike McCormack <[email protected]> Acked-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-07rtlwifi: Fix logic in rx_interruptMike McCormack1-1/+1
Should pass along packet if there's no CRC and no hardware error. Signed-off-by: Mike McCormack <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-03rtlwifi: Fix logic in rx_interruptMike McCormack1-1/+1
Should pass along packet if there's no CRC and no hardware error. Signed-off-by: Mike McCormack <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-03rtlwifi: Use write barrier when assigning ownershipMike McCormack1-0/+2
Make sure all updates to a descriptor are flushed to memory before assigning ownship to hardware. Signed-off-by: Mike McCormack <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-03rtlwifi: Assign rx buffer ownership to hardware lastMike McCormack1-2/+3
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 <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-03rtlwifi: Don't block interrupts in spinlocksMike McCormack3-38/+26
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 <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-06-03rtlwifi: Run IPS leave work in a taskletMike McCormack3-2/+14
This removes the need to use IRQ safe spinlocks in many places. Signed-off-by: Mike McCormack <[email protected]> Signed-off-by: Larry Finger <[email protected]> Signed-off-by: John W. Linville <[email protected]>