Commit graph

299,176 commits

Author SHA1 Message Date
Stanislaw Gruszka
7cabafcea7 ipw2x00: fix rtnl mutex deadlock
This fix regression introduced by:

commit: ecb4433550
Author: Stanislaw Gruszka <sgruszka@redhat.com>
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 <baryluk@smp.if.uj.edu.pl>
Bisected-by: Michael Witten <mfwitten@gmail.com>
Tested-by: Witold Baryluk <baryluk@smp.if.uj.edu.pl>
Tested-by: Michael Witten <mfwitten@gmail.com>
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-09-16 15:32:09 -04:00
Rajkumar Manoharan
aa3d7eef39 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 <mcgrof@gmail.com>
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Acked-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-09-16 15:32:08 -04:00
Anton Blanchard
fb82fd204b ibmveth: Fix checksum offload failure handling
Fix a number of issues in ibmveth_set_csum_offload:

- set_attr6 and clr_attr6 may be used uninitialised

- We store the result of the IPV4 checksum change in ret but overwrite
  it in a couple of places before checking it again later. Add ret4
  to make it obvious what we are doing.

- We weren't clearing the NETIF_F_IP_CSUM and NETIF_F_IPV6_CSUM flags
  if the enable of that hypervisor feature failed.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-09-16 15:26:32 -04:00
Anton Blanchard
91aae1e5c4 ibmveth: Checksum offload is always disabled
Commit b9367bf3ee (net: ibmveth: convert to hw_features) reversed
a check in ibmveth_set_csum_offload that results in checksum offload
never being enabled.

Signed-off-by: Anton Blanchard <anton@samba.org>
Cc: <stable@kernel.org> # 3.0+
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-09-16 15:26:32 -04:00
Anton Blanchard
b93da27f52 ibmveth: Fix issue with DMA mapping failure
descs[].fields.address is 32bit which truncates any dma mapping
errors so dma_mapping_error() fails to catch it.

Use a dma_addr_t to do the comparison. With this patch I was able
to transfer many gigabytes of data with IOMMU fault injection set
at 10% probability.

Signed-off-by: Anton Blanchard <anton@samba.org>
Cc: <stable@kernel.org> # v2.6.37+
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-09-16 15:26:32 -04:00
Brian King
33a48ab105 ibmveth: Fix DMA unmap error
Commit 6e8ab30ec6 (ibmveth: Add scatter-gather support) introduced a
DMA mapping API inconsistency resulting in dma_unmap_page getting
called on memory mapped via dma_map_single. This was seen when
CONFIG_DMA_API_DEBUG was enabled. Fix up this API usage inconsistency.

Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Acked-by: Anton Blanchard <anton@samba.org>
Cc: <stable@kernel.org> # v2.6.37+
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-09-16 15:26:32 -04:00
David S. Miller
e3b37a1bda Merge git://github.com/Jkirsher/net-next 2011-09-16 15:18:02 -04:00
David S. Miller
9c223f9bba Merge branch 'for-davem' of git://git.infradead.org/users/linville/wireless-next 2011-09-16 15:14:19 -04:00
Julia Lawall
c0569981b3 drivers/staging/mei/interface.c: take size of pointed value, not pointer
Sizeof a pointer-typed expression returns the size of the pointer, not that
of the pointed data.

The semantic patch that fixes this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression *e;
type T;
identifier f;
@@

f(...,(T)e,...,
-sizeof(e)
+sizeof(*e)
,...)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:49:18 +02:00
Leonid V. Fedorenchik
661d3bf652 Staging: cx25821: cx25821-video.h: Fix long lines
Fix long function prototypes and line up arguments nicely.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:46 +02:00
Leonid V. Fedorenchik
64eb324424 Staging: cx25821: cx25821-video.h: Fix indent
Fix indent of function arguments.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:46 +02:00
Leonid V. Fedorenchik
9ad6902d22 Staging: cx25821: cx25821-video.h: Line up constant
Line up integer constant with others.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:46 +02:00
Leonid V. Fedorenchik
3038f638ac Staging: cx25821: Replace :? by if-else in cx25821-video.c
Replace :? operator by equivalent if-else statement where in improves
readability. Don't add else branch if it is not needed.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:46 +02:00
Leonid V. Fedorenchik
e313e1f983 Staging: cx25821: Fix braces around statements in cx25821-video.c
Delete braces around single statements.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:46 +02:00
Leonid V. Fedorenchik
527db49d91 Staging: cx25821: Change indent with spaces to tabs 35
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:45 +02:00
Leonid V. Fedorenchik
fa7ce1f41d Staging: cx25821: Change indent with spaces to tabs 34
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:45 +02:00
Leonid V. Fedorenchik
d2a167c8fc Staging: cx25821: Change indent with spaces to tabs 33
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:45 +02:00
Leonid V. Fedorenchik
2a51749fd5 Staging: cx25821: Change indent with spaces to tabs 32
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:45 +02:00
Leonid V. Fedorenchik
12fe746fa9 Staging: cx25821: Change indent with spaces to tabs 31
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:45 +02:00
Leonid V. Fedorenchik
16a81efe88 Staging: cx25821: Change indent with spaces to tabs 30
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:45 +02:00
Leonid V. Fedorenchik
5e6440141e Staging: cx25821: Change indent with spaces to tabs 29
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:45 +02:00
Leonid V. Fedorenchik
f9ef6be389 Staging: cx25821: Change indent with spaces to tabs 28
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:44 +02:00
Leonid V. Fedorenchik
43be3824d9 Staging: cx25821: Change indent with spaces to tabs 27
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:44 +02:00
Leonid V. Fedorenchik
6f87cc6cd9 Staging: cx25821: Change indent with spaces to tabs 26
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:44 +02:00
Leonid V. Fedorenchik
75965b8f6f Staging: cx25821: Change indent with spaces to tabs 25
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:44 +02:00
Leonid V. Fedorenchik
8a911ed9c0 Staging: cx25821: Change indent with spaces to tabs 24
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:44 +02:00
Leonid V. Fedorenchik
e0b871bd2c Staging: cx25821: Change indent with spaces to tabs 23
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:44 +02:00
Leonid V. Fedorenchik
70e7f145e4 Staging: cx25821: Change indent with spaces to tabs 22
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:44 +02:00
Leonid V. Fedorenchik
f9a8150c92 Staging: cx25821: Change indent with spaces to tabs 21
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:43 +02:00
Leonid V. Fedorenchik
02859b61cc Staging: cx25821: Change indent with spaces to tabs 20
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:43 +02:00
Leonid V. Fedorenchik
6678762aa2 Staging: cx25821: Change indent with spaces to tabs 19
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:43 +02:00
Leonid V. Fedorenchik
255c040a42 Staging: cx25821: Change indent with spaces to tabs 18
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:43 +02:00
Leonid V. Fedorenchik
a39bea3a4e Staging: cx25821: Change indent with spaces to tabs 17
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:43 +02:00
Leonid V. Fedorenchik
eda59eb189 Staging: cx25821: Change indent with spaces to tabs 16
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:43 +02:00
Leonid V. Fedorenchik
3f3d9e4a54 Staging: cx25821: Change indent with spaces to tabs 15
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:43 +02:00
Leonid V. Fedorenchik
21377cdd5e Staging: cx25821: Change indent with spaces to tabs 14
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:42 +02:00
Leonid V. Fedorenchik
55c37c0d6c Staging: cx25821: Change indent with spaces to tabs 13
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:42 +02:00
Leonid V. Fedorenchik
20e8a366c0 Staging: cx25821: Change indent with spaces to tabs 12
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:42 +02:00
Leonid V. Fedorenchik
0bf42c9e4f Staging: cx25821: Change indent with spaces to tabs 11
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:42 +02:00
Leonid V. Fedorenchik
9eadb1711c Staging: cx25821: Change indent with spaces to tabs 10
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:42 +02:00
Leonid V. Fedorenchik
fb5f2c8010 Staging: cx25821: Change indent with spaces to tabs 9
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:42 +02:00
Leonid V. Fedorenchik
8ebbda49b7 Staging: cx25821: Change indent with spaces to tabs 8
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:42 +02:00
Leonid V. Fedorenchik
e6cf66c1c0 Staging: cx25821: Change indent with spaces to tabs 7
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:41 +02:00
Leonid V. Fedorenchik
8e4ac0741f Staging: cx25821: Change indent with spaces to tabs 6
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:41 +02:00
Leonid V. Fedorenchik
2ba5149861 Staging: cx25821: Change indent with spaces to tabs 5
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:41 +02:00
Leonid V. Fedorenchik
84cd410e11 Staging: cx25821: Change indent with spaces to tabs 4
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:41 +02:00
Leonid V. Fedorenchik
48eb80ba3d Staging: cx25821: Change indent with spaces to tabs 3
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:41 +02:00
Leonid V. Fedorenchik
788d0f33b9 Staging: cx25821: Change indent with spaces to tabs 2
Change indent with spaces to use tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:41 +02:00
Leonid V. Fedorenchik
69dfe45f7b Staging: cx25821: Change indent with spaces to tabs 1
Changed indent with spaces to use tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:41 +02:00
Leonid V. Fedorenchik
c2c311fd3b Staging: cx25821: Fix indent in comment
Change indent in comment to use tabs instead of spaces.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:41 +02:00