]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
13 years agoMerge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Wed, 12 Oct 2011 02:48:08 +0000 (13:48 +1100)]
Merge remote-tracking branch 'cpufreq/next'

13 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 02:46:41 +0000 (13:46 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'

13 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 02:44:24 +0000 (13:44 +1100)]
Merge remote-tracking branch 'sound/for-next'

Conflicts:
arch/arm/plat-omap/devices.c
arch/mips/alchemy/devboards/db1x00/platform.c
sound/mips/Kconfig

13 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 12 Oct 2011 02:38:43 +0000 (13:38 +1100)]
Merge remote-tracking branch 'crypto/master'

13 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 12 Oct 2011 02:37:21 +0000 (13:37 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
arch/arm/mach-at91/board-afeb-9260v1.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-rm9200dk.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
arch/arm/mach-at91/board-usb-a9260.c
drivers/mtd/maps/lantiq-flash.c

13 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 12 Oct 2011 02:36:15 +0000 (13:36 +1100)]
Merge remote-tracking branch 'bluetooth/master'

Conflicts:
net/bluetooth/hci_core.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c
net/bluetooth/smp.c

13 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Wed, 12 Oct 2011 02:13:23 +0000 (13:13 +1100)]
Merge remote-tracking branch 'wireless/master'

13 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Wed, 12 Oct 2011 02:06:37 +0000 (13:06 +1100)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/s390/cio/qdio_main.c

13 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 12 Oct 2011 02:03:53 +0000 (13:03 +1100)]
Merge remote-tracking branch 'slave-dma/next'

13 years agoMerge remote-tracking branch 'scsi/master'
Stephen Rothwell [Wed, 12 Oct 2011 02:01:43 +0000 (13:01 +1100)]
Merge remote-tracking branch 'scsi/master'

13 years agoMerge remote-tracking branch 'ibft/master'
Stephen Rothwell [Wed, 12 Oct 2011 02:01:39 +0000 (13:01 +1100)]
Merge remote-tracking branch 'ibft/master'

13 years agoMerge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Wed, 12 Oct 2011 02:01:33 +0000 (13:01 +1100)]
Merge remote-tracking branch 'swiotlb/master'

13 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 02:00:13 +0000 (13:00 +1100)]
Merge remote-tracking branch 'ieee1394/for-next'

13 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:58:35 +0000 (12:58 +1100)]
Merge remote-tracking branch 'infiniband/for-next'

13 years agoMerge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Wed, 12 Oct 2011 01:57:17 +0000 (12:57 +1100)]
Merge remote-tracking branch 'libata/NEXT'

13 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:57:13 +0000 (12:57 +1100)]
Merge remote-tracking branch 'kconfig/for-next'

13 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:55:50 +0000 (12:55 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

13 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Wed, 12 Oct 2011 01:54:05 +0000 (12:54 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

13 years agoMerge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Wed, 12 Oct 2011 01:52:43 +0000 (12:52 +1100)]
Merge remote-tracking branch 'docs/docs-move'

13 years agoMerge branch 'quilt/kernel-doc'
Stephen Rothwell [Wed, 12 Oct 2011 01:51:31 +0000 (12:51 +1100)]
Merge branch 'quilt/kernel-doc'

13 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:50:11 +0000 (12:50 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

13 years agoMerge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Wed, 12 Oct 2011 01:48:59 +0000 (12:48 +1100)]
Merge branch 'quilt/jdelvare-hwmon'

13 years agoMerge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Wed, 12 Oct 2011 01:47:40 +0000 (12:47 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

13 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Wed, 12 Oct 2011 01:46:29 +0000 (12:46 +1100)]
Merge branch 'quilt/i2c'

13 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:45:10 +0000 (12:45 +1100)]
Merge remote-tracking branch 'hid/for-next'

Conflicts:
drivers/hid/hid-wacom.c

13 years agoMerge remote-tracking branch 'xfs/master'
Stephen Rothwell [Wed, 12 Oct 2011 01:43:41 +0000 (12:43 +1100)]
Merge remote-tracking branch 'xfs/master'

Conflicts:
fs/xfs/xfs_aops.c
fs/xfs/xfs_super.c

13 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:42:27 +0000 (12:42 +1100)]
Merge remote-tracking branch 'v9fs/for-next'

13 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:40:58 +0000 (12:40 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

13 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:34:53 +0000 (12:34 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

13 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 12 Oct 2011 01:33:39 +0000 (12:33 +1100)]
Merge remote-tracking branch 'logfs/master'

13 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 12 Oct 2011 01:32:24 +0000 (12:32 +1100)]
Merge remote-tracking branch 'gfs2/master'

13 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 12 Oct 2011 01:30:56 +0000 (12:30 +1100)]
Merge remote-tracking branch 'ext4/dev'

13 years agoMerge remote-tracking branch 'cifs/master'
Stephen Rothwell [Wed, 12 Oct 2011 01:29:40 +0000 (12:29 +1100)]
Merge remote-tracking branch 'cifs/master'

13 years agoMerge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:28:21 +0000 (12:28 +1100)]
Merge remote-tracking branch 'ceph/for-next'

13 years agoMerge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Wed, 12 Oct 2011 01:27:08 +0000 (12:27 +1100)]
Merge remote-tracking branch 'xtensa/master'

13 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Wed, 12 Oct 2011 01:25:56 +0000 (12:25 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'

13 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Wed, 12 Oct 2011 01:24:41 +0000 (12:24 +1100)]
Merge remote-tracking branch 'tile/master'

13 years agoMerge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Wed, 12 Oct 2011 01:23:28 +0000 (12:23 +1100)]
Merge remote-tracking branch 'rmobile/rmobile-latest'

13 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Wed, 12 Oct 2011 01:22:16 +0000 (12:22 +1100)]
Merge remote-tracking branch 'sh/sh-latest'

13 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 12 Oct 2011 01:15:48 +0000 (12:15 +1100)]
Merge remote-tracking branch 's390/features'

13 years agoMerge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Wed, 12 Oct 2011 01:14:30 +0000 (12:14 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

13 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Wed, 12 Oct 2011 01:08:04 +0000 (12:08 +1100)]
Merge remote-tracking branch 'powerpc/next'

13 years agoMerge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:06:53 +0000 (12:06 +1100)]
Merge remote-tracking branch 'parisc/for-next'

13 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:05:31 +0000 (12:05 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

13 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:04:12 +0000 (12:04 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

13 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:03:01 +0000 (12:03 +1100)]
Merge remote-tracking branch 'm68k/for-next'

13 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Wed, 12 Oct 2011 01:01:49 +0000 (12:01 +1100)]
Merge remote-tracking branch 'ia64/next'

13 years agoMerge branch 'quilt/hexagon'
Stephen Rothwell [Wed, 12 Oct 2011 01:00:29 +0000 (12:00 +1100)]
Merge branch 'quilt/hexagon'

13 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 00:59:11 +0000 (11:59 +1100)]
Merge remote-tracking branch 'cris/for-next'

13 years agoMerge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Wed, 12 Oct 2011 00:52:44 +0000 (11:52 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'

13 years agoMerge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Wed, 12 Oct 2011 00:51:33 +0000 (11:51 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'

13 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 00:50:15 +0000 (11:50 +1100)]
Merge remote-tracking branch 'tegra/for-next'

13 years agoMerge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 00:46:56 +0000 (11:46 +1100)]
Merge remote-tracking branch 's5p/for-next'

Conflicts:
arch/arm/mach-exynos4/Kconfig
drivers/gpio/Makefile

13 years agoMerge remote-tracking branch 'i.MX/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 00:45:32 +0000 (11:45 +1100)]
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-mx5/mm.c

13 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Wed, 12 Oct 2011 00:44:06 +0000 (11:44 +1100)]
Merge remote-tracking branch 'at91/at91-next'

Conflicts:
arch/arm/mach-at91/at91sam9g45.c

13 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 00:38:08 +0000 (11:38 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/Kconfig.debug
arch/arm/kernel/smp.c
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-nuc93x/Makefile.boot
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard.h
arch/arm/mach-u300/Makefile.boot
arch/arm/plat-mxc/include/mach/gpio.h

13 years agoMerge remote-tracking branch 'arm-lpae/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 00:30:18 +0000 (11:30 +1100)]
Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/page.h
arch/arm/include/asm/pgtable-hwdef.h
arch/arm/include/asm/pgtable.h
arch/arm/kernel/head.S
arch/arm/kernel/sleep.S
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c

13 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 00:29:01 +0000 (11:29 +1100)]
Merge remote-tracking branch 'arm/for-next'

13 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Wed, 12 Oct 2011 00:22:37 +0000 (11:22 +1100)]
Merge remote-tracking branch 'pci-current/for-linus'

13 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Wed, 12 Oct 2011 00:22:36 +0000 (11:22 +1100)]
Merge remote-tracking branch 'net/master'

13 years agoMerge remote-tracking branch 'sparc/master'
Stephen Rothwell [Wed, 12 Oct 2011 00:22:36 +0000 (11:22 +1100)]
Merge remote-tracking branch 'sparc/master'

13 years agoMerge remote-tracking branch 'm68k-current/for-linus'
Stephen Rothwell [Wed, 12 Oct 2011 00:22:34 +0000 (11:22 +1100)]
Merge remote-tracking branch 'm68k-current/for-linus'

13 years agoMerge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Wed, 12 Oct 2011 00:22:33 +0000 (11:22 +1100)]
Merge remote-tracking branch 'arm-current/fixes'

13 years agoath9k: only send FCS-fail packets to mac80211 if requested
Felix Fietkau [Sat, 8 Oct 2011 20:02:59 +0000 (22:02 +0200)]
ath9k: only send FCS-fail packets to mac80211 if requested

Prevents lots of broken frames from showing up on monitor interfaces
by default.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoath9k_hw: fix a regression in key miss handling
Felix Fietkau [Sat, 8 Oct 2011 20:02:58 +0000 (22:02 +0200)]
ath9k_hw: fix a regression in key miss handling

The commit "ath9k_hw: Fix incorrect key_miss handling" changed the code
to only report key miss errors if a MIC error wasn't reported.
When checking the flags in that order in the MAC code, it might miss some
real events, because the value of the MIC error flag is undefined under
some conditions.

The primary issue addressed by the previous commit is making sure that
MIC errors are properly reported on the STA side. This can be fixed in
a better way by adding a separate rx status flag for key miss and
ignoring it for multicast frames.

This fix slightly improves stability in AP mode on some older hardware,
like AR9132.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Cc: stable@kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoath9k_hw: remove EEP_REG_1
Felix Fietkau [Sat, 8 Oct 2011 18:06:22 +0000 (20:06 +0200)]
ath9k_hw: remove EEP_REG_1

It was previously used for current_rd_ext

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoath: remove ath_regulatory::current_rd_ext
Felix Fietkau [Sat, 8 Oct 2011 18:06:21 +0000 (20:06 +0200)]
ath: remove ath_regulatory::current_rd_ext

It is unused since the previous dead code that was using it had been
removed earlier.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoath9k_hw: clean up tx power handling
Felix Fietkau [Sat, 8 Oct 2011 18:06:20 +0000 (20:06 +0200)]
ath9k_hw: clean up tx power handling

The code for handling various restrictions concerning regulatory limits,
antenna gain, etc. is very convoluted and duplicated across various
EEPROM parsing implementations, making it hard to review.

This patch partially cleans up the mess by unifying regulatory limit
handling in one function and simplifying handling of antenna gain.
It also removes unused transmit power scaling arrays from the EEPROM code,
which belonged to an unimplemented API that isn't supposed to be in
the driver anyway.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoath9k_hw: make ath9k_hw_set_interrupts use ah->imask by default
Felix Fietkau [Sat, 8 Oct 2011 18:06:19 +0000 (20:06 +0200)]
ath9k_hw: make ath9k_hw_set_interrupts use ah->imask by default

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoath9k: disable unnecessary PHY error reporting
Felix Fietkau [Sat, 8 Oct 2011 13:49:57 +0000 (15:49 +0200)]
ath9k: disable unnecessary PHY error reporting

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 <nbd@openwrt.org>
Cc: stable@kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agob43: trivial: do not report any link quality instead of invalid one
Rafał Miłecki [Fri, 7 Oct 2011 20:39:35 +0000 (22:39 +0200)]
b43: trivial: do not report any link quality instead of invalid one

We don't want to report random quality info (new PHYs are affected).

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agortlwifi: Change debug parameter to apply to individual drivers
Larry Finger [Fri, 7 Oct 2011 16:27:33 +0000 (11:27 -0500)]
rtlwifi: Change debug parameter to apply to individual drivers

The current debug parameter is applied to rtlwifi, which means that all
loaded drivers have the same level of debugging applied. In addition,
the previous method requires a two-step load process to enable debugging.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agomac80211: dont orphan TX skb
Johannes Berg [Fri, 7 Oct 2011 12:55:40 +0000 (14:55 +0200)]
mac80211: dont orphan TX skb

This was another workaround for truesize "bugs".
The reason we did this was that when we orphaned
the SKB it wouldn't be truesize-checked later.
Now that the check is gone (and we just charge
the former smaller size to the socket) there's
no longer a reason to orphan the skb here.

Keep the skb charged to the socket until it is
really freed (or orphaned in TX status). This
helps flow control and allows us to get at the
socket later for other purposes.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agomac80211: dont adjust truesize
Johannes Berg [Fri, 7 Oct 2011 12:55:39 +0000 (14:55 +0200)]
mac80211: dont adjust truesize

There's no need to adjust truesize.

The history of this was that we always ran into
skb_truesize_bug (via skb_truesize_check) which
has since been removed in commit 92a0acce186cd.
skb_truesize_check() checked that truesize  was
bigger or equal to the actual allocation, which
would trigger in mac80211 due to header adding.
The check no longer exists and we shouldn't be
messing with the truesize anwyay.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agomac80211: parse radiotap header earlier
Johannes Berg [Fri, 7 Oct 2011 12:01:26 +0000 (14:01 +0200)]
mac80211: parse radiotap header earlier

We can now move the radiotap header parsing into
ieee80211_monitor_start_xmit(). This moves it out of
the hotpath, and also helps the code since now the
radiotap header will no longer be present in
ieee80211_xmit() etc. which is easier to understand.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agomac80211: move fragment flag to info flag as dont-fragment
Johannes Berg [Fri, 7 Oct 2011 12:01:25 +0000 (14:01 +0200)]
mac80211: move fragment flag to info flag as dont-fragment

The purpose of this is two-fold:
 1) by moving it out of tx_data.flags, we can in
    another patch move the radiotap parsing so it
    no longer is in the hotpath
 2) if a device implements fragmentation but can
    optionally skip it, the radiotap request for
    not doing fragmentation may be honoured

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agomac80211: remove tx_data ethertype
Johannes Berg [Fri, 7 Oct 2011 12:01:24 +0000 (14:01 +0200)]
mac80211: remove tx_data ethertype

It's set, but never used, so kill it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agomac80211: optimise monitor xmit
Johannes Berg [Fri, 7 Oct 2011 12:01:23 +0000 (14:01 +0200)]
mac80211: optimise monitor xmit

Since the only way the interface can be a monitor
interface in ieee80211_xmit() is because the frame
came from ieee80211_monitor_start_xmit() we can
move all the code there.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agomac80211: Update injection documentation
Helmut Schaa [Fri, 7 Oct 2011 09:53:41 +0000 (11:53 +0200)]
mac80211: Update injection documentation

Add documentation about NOACK tx flag usage.

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoath9k: fix retry counting / BAR handling during queue flush
Felix Fietkau [Fri, 7 Oct 2011 00:28:15 +0000 (02:28 +0200)]
ath9k: fix retry counting / BAR handling during queue flush

When tx is suspended temporarily and the queue is flushed, do not increase
the retry count or attempt to send out BAR frames. Instead simply retry
the affected subframes normally after the reset.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoath9k: improve PS filter clearing and retry counting for A-MPDU
Felix Fietkau [Fri, 7 Oct 2011 00:28:14 +0000 (02:28 +0200)]
ath9k: improve PS filter clearing and retry counting for A-MPDU

Do not increment the retry counter if packets to a sleeping station
were not sent because of tx failure, instead of only checking the filter
flag.
Clear the PS filter only after an A-MPDU was reported as filtered,
otherwise the hardware might do some unnecessary extra retransmissions.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoath9k: keep track of what's triggering hardware resets
Felix Fietkau [Fri, 7 Oct 2011 00:28:13 +0000 (02:28 +0200)]
ath9k: keep track of what's triggering hardware resets

Export how many times each of the reset triggers has fired through debugfs.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoath9k: indicate which queues are blocked when stopping tx fails
Felix Fietkau [Fri, 7 Oct 2011 00:28:12 +0000 (02:28 +0200)]
ath9k: indicate which queues are blocked when stopping tx fails

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agomac80211: Fix regression that allowed mpaths between non-peers.
Javier Cardona [Thu, 6 Oct 2011 21:54:22 +0000 (14:54 -0700)]
mac80211: Fix regression that allowed mpaths between non-peers.

Mesh paths should only exist over established peer links.

Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agomwifiex: fix smatch errors
Yogesh Ashok Powar [Wed, 5 Oct 2011 21:58:24 +0000 (14:58 -0700)]
mwifiex: fix smatch errors

drivers/net/wireless/mwifiex/main.c +828 mwifiex_remove_card(52)
  error: potential null derefence 'priv'.
drivers/net/wireless/mwifiex/main.c +828 mwifiex_remove_card(52)
  error: we previously assumed 'priv' could be null (see line 820)
drivers/net/wireless/mwifiex/txrx.c +90 mwifiex_process_tx(24)
  error: potential null derefence 'local_tx_pd'.
drivers/net/wireless/mwifiex/sta_ioctl.c +766
mwifiex_rate_ioctl_set_rate_value(30)
  error: buffer overflow 'rate' 14 <= 14

Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoath9k: remove some bogus error handling code
Dan Carpenter [Wed, 5 Oct 2011 05:48:20 +0000 (08:48 +0300)]
ath9k: remove some bogus error handling code

If "axq_qnum >= ARRAY_SIZE(sc->tx.txq)", then the call to
ath9k_hw_releasetxqueue() would read beyond the end of the ah->txq[]
array and possibly corrupt memory.  Fortunately,
ath9k_hw_setuptxqueue() doesn't return high values of "axq_qnum" and
this code can be removed.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoath5k: remove some unneeded error handling code
Dan Carpenter [Wed, 5 Oct 2011 05:46:37 +0000 (08:46 +0300)]
ath5k: remove some unneeded error handling code

th5k_hw_setup_tx_queue() returns a valid offset into the ah->ah_txq[]
array.  The ah->ah_txq[] and the ah->txqs[] array are the same size.
Both have AR5K_NUM_TX_QUEUES elements.  So this error handling code
will never trigger.

Also it's wrong.  The call to ath5k_hw_release_tx_queue() with a qnum
of AR5K_NUM_TX_QUEUES or more will just trigger a WARN_ON() and
return.  Or if it missed the WARN_ON(), it would just corrupt some
memory and return.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agomac80211: fix offchannel TX cookie matching
Johannes Berg [Tue, 4 Oct 2011 16:27:10 +0000 (18:27 +0200)]
mac80211: fix offchannel TX cookie matching

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.

Cc: stable@kernel.org [2.6.38+]
Reported-by: Jouni Malinen <j@w1.fi>
Tested-by: Jouni Malinen <j@w1.fi>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoiwlagn: separate init calib and rt calib
Wey-Yi Guy [Tue, 4 Oct 2011 14:10:19 +0000 (07:10 -0700)]
iwlagn: separate init calib and rt calib

My previous patch for init calib cfg disable a set of calibration for both
init and runtime which cause performance issue, Fix it

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agomac80211: pass no-CCK flag through to HW scan
Johannes Berg [Tue, 4 Oct 2011 13:07:33 +0000 (15:07 +0200)]
mac80211: pass no-CCK flag through to HW scan

This is needed so that offloaded scan can do the
right thing. Without this patch, the no_cck flag
contains random values from the kernel heap.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoMerge branches 'amso1100', 'cma', 'cxgb4', 'fdr', 'ipath', 'misc', 'mlx4', 'mthca...
Roland Dreier [Tue, 11 Oct 2011 19:56:31 +0000 (12:56 -0700)]
Merge branches 'amso1100', 'cma', 'cxgb4', 'fdr', 'ipath', 'misc', 'mlx4', 'mthca' and 'nes' into for-next

13 years agoMerge branch 'for-linville' of git://github.com/lucacoelho/wl12xx
John W. Linville [Tue, 11 Oct 2011 19:56:29 +0000 (15:56 -0400)]
Merge branch 'for-linville' of git://github.com/lucacoelho/wl12xx

13 years agonet: wireless: add brcm80211 drivers
Arend van Spriel [Wed, 5 Oct 2011 11:19:03 +0000 (13:19 +0200)]
net: wireless: add brcm80211 drivers

Add the brcm80211 tree to drivers/net/wireless, and disable the version that's
in drivers/staging.  This version includes the sources currently in staging,
plus any changes that have been sent out for review.

Sources in staging will be deleted in a followup patch.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoMerge branch 'for-davem' of git://git.infradead.org/users/linville/wireless-next
David S. Miller [Tue, 11 Oct 2011 19:39:21 +0000 (15:39 -0400)]
Merge branch 'for-davem' of git://git.infradead.org/users/linville/wireless-next

13 years agoMerge branch 'master' of git://git.infradead.org/users/linville/wireless-next into...
John W. Linville [Tue, 11 Oct 2011 19:35:42 +0000 (15:35 -0400)]
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem

Conflicts:
Documentation/feature-removal-schedule.txt

13 years agoath6kl: fixup merge damage in ath6kl_mgmt_tx
John W. Linville [Tue, 11 Oct 2011 19:33:10 +0000 (15:33 -0400)]
ath6kl: fixup merge damage in ath6kl_mgmt_tx

  CC [M]  drivers/net/wireless/ath/ath6kl/cfg80211.o
drivers/net/wireless/ath/ath6kl/cfg80211.c:1838:2: warning: initialization from incompatible pointer type

Caused by commit e9f935e3e8dc0bddd0df6d148165d95925422502...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoMerge branch 'next/cleanup2' into for-next
Arnd Bergmann [Tue, 11 Oct 2011 19:26:38 +0000 (21:26 +0200)]
Merge branch 'next/cleanup2' into for-next

Conflicts:
arch/arm/plat-s5p/include/plat/pll.h

13 years agoMerge branch 'next/cross-platform' into for-next
Arnd Bergmann [Tue, 11 Oct 2011 19:26:19 +0000 (21:26 +0200)]
Merge branch 'next/cross-platform' into for-next

Conflicts:
arch/arm/Kconfig.debug

13 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
David S. Miller [Tue, 11 Oct 2011 19:24:56 +0000 (15:24 -0400)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next

13 years agoMerge branches 'cross-platform/debug_ll' and 'cross-platform/cpu-mapping' into next...
Arnd Bergmann [Tue, 11 Oct 2011 19:20:41 +0000 (21:20 +0200)]
Merge branches 'cross-platform/debug_ll' and 'cross-platform/cpu-mapping' into next/cross-platform