Commits · ad226ec22b92d7f0f834015149b1d1118e017f16 · Kirill Smelkov / linux

10 Aug, 2011 1 commit

ath6kl: fix function name conflicts with ath9k · ad226ec2

Kalle Valo authored Aug 10, 2011

Stephen reported that compilation fails if both ath6kl and ath9k are
compiled in:

drivers/net/wireless/ath/ath6kl/built-in.o: In function `htc_start':
(.opd+0x600): multiple definition of `htc_start'
drivers/net/wireless/ath/ath9k/built-in.o:(.opd+0x3e40): first defined here
drivers/net/wireless/ath/ath6kl/built-in.o: In function `.htc_stop':
(.text+0x7b40): multiple definition of `.htc_stop'
drivers/net/wireless/ath/ath9k/built-in.o:(.text+0x67b34): first defined he=
re
drivers/net/wireless/ath/ath6kl/built-in.o: In function `.htc_start':
(.text+0x7d18): multiple definition of `.htc_start'
drivers/net/wireless/ath/ath9k/built-in.o:(.text+0x67ba0): first defined he=
re
drivers/net/wireless/ath/ath6kl/built-in.o: In function `htc_stop':
(.opd+0x5e8): multiple definition of `htc_stop'
drivers/net/wireless/ath/ath9k/built-in.o:(.opd+0x3e28): first defined here

To fix this add ath6kl prefix to all public functions in htc.c.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

ad226ec2

09 Aug, 2011 39 commits

ath6kl: Release the memory allocated for the firmware · 19703573

Raja Mani authored Aug 04, 2011

Nowhere the firmware memory is freed, free it during
the device destroy process.
Signed-off-by: Raja Mani <rmani@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

19703573

ath6kl: Fix crash during the connection process · 9aa60357

Raja Mani authored Aug 04, 2011

Sometimes, the network manager is failing to connect to the AP due
to the below kernel crash message. The reason behind this,
after issuing the connect command to the chip, the chip is sending
disconnect event and then immediately one connect event to the host
in some random cases.

The host driver resets all states (including cfg80211 state machine)
when it receives disconnect event from the chip. But, still the host
driver reports the next received connect event to cfg80211, at that time
cfg80211 SME state would have been in IDLE state, which was causing
the below kernel crash.

Now, host driver's sme state machine is checked every time before
delivering connect event to cfg80211

  WARNING: at net/wireless/sme.c:517 cfg80211_connect_result+0x10d/0x120()
  [..]
  Call Trace:
  [<c0145732>] warn_slowpath_common+0x72/0xa0
  [<c05d676d>] ? cfg80211_connect_result+0x10d/0x120
  [<c05d676d>] ? cfg80211_connect_result+0x10d/0x120
  [<c0145782>] warn_slowpath_null+0x22/0x30
  [<c05d676d>] cfg80211_connect_result+0x10d/0x120
  [<f83ff497>] ath6kl_cfg80211_connect_event+0x427/0x4f0 [ath6kl]
  [<c035d26a>] ? put_dec+0x2a/0xa0
  [<c035d645>] ? number+0x365/0x380
  [<c0154675>] ? mod_timer+0x135/0x260
  [<c035e00e>] ? format_decode+0x2fe/0x370
  [<c01263c8>] ? default_spin_lock_flags+0x8/0x10
  [<c05fd91f>] ? _raw_spin_lock_irqsave+0x2f/0x50
  [<c0146032>] ? console_unlock+0x172/0x1c0
  [<f8402659>] ath6kl_connect_event+0x89/0x400 [ath6kl]
  [<f840826e>] ath6kl_wmi_control_rx+0x98e/0x1d60 [ath6kl]
  [<c01335b5>] ? __wake_up+0x45/0x60
  [<f84053aa>] ath6kl_rx+0x56a/0x770 [ath6kl]
  [<c04d0242>] ? mmc_release_host+0x22/0x40
  [<c04d9329>] ? sdio_release_host+0x19/0x30
  [<f840a27a>] ? ath6kl_sdio_read_write_sync+0x7a/0xc0 [ath6kl]
  [<f83f82b1>] do_rx_completion+0x41/0x50 [ath6kl]
  [<f83faa6a>] htc_rxmsg_pending_handler+0x6ba/0xbd0 [ath6kl]
  [<f8404bb0>] ? ath6kl_tx_data_cleanup+0x30/0x30 [ath6kl]
  [<f840a1c0>] ? ath6kl_sdio_irq_handler+0x30/0x70 [ath6kl]
  [<f83f7cd5>] ath6kldev_intr_bh_handler+0x2a5/0x630 [ath6kl]
  [<f840a1c0>] ath6kl_sdio_irq_handler+0x30/0x70 [ath6kl]
  [<c04d97c7>] sdio_irq_thread+0xc7/0x2d0
  [<c013aeb0>] ? default_wake_function+0x10/0x20
  [<c012fc98>] ? __wake_up_common+0x48/0x70
  [<c04d9700>] ? sdio_claim_irq+0x200/0x200
  [<c0163854>] kthread+0x74/0x80
  [<c01637e0>] ? kthread_worker_fn+0x160/0x160
  [<c0604c06>] kernel_thread_helper+0x6/0x10
Signed-off-by: Raja Mani <rmani@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

9aa60357

ath6kl: Cleanup void * in ath6kl_cfg80211_scan_node() · 91db35da

Vasanthakumar Thiagarajan authored Jul 21, 2011

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

91db35da

ath6kl: Use ath6kl_cfg80211_scan_node() directly instead of function pointer · 8a8bc5a4
Vasanthakumar Thiagarajan authored Jul 21, 2011
```
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
```
8a8bc5a4

ath6kl: Remove ath6kl_wmi_iterate_nodes() · 77fccc78

Vasanthakumar Thiagarajan authored Jul 21, 2011

Use wlan_iterate_nodes() directly.
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

77fccc78

ath6kl: Pass only the needed scan_table to ath6kl_wmi_iterate_nodes() · 39dd3fcb
Vasanthakumar Thiagarajan authored Jul 21, 2011
```
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
```
39dd3fcb

ath6kl: Move initialization/deinitialization of scan_table to appropriate functions · 852bd9d9

Vasanthakumar Thiagarajan authored Jul 21, 2011

By having scan_table in struct ath6kl, it makes sense to move initialization
to ath6kl_init() and deinitialization to ath6kl_destroy().
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

852bd9d9

ath6kl: Cleanup parameters of wlan_node_table_init() · 9d0c6bcf

Vasanthakumar Thiagarajan authored Jul 21, 2011

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

9d0c6bcf

ath6kl: Remove ath6kl_wmi_get_current_bssid() · 46ff8d59

Vasanthakumar Thiagarajan authored Jul 21, 2011

Use the bssid from ath6kl directly.
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

46ff8d59

ath6kl: Remove bssid from struct wmi · 70df0516

Vasanthakumar Thiagarajan authored Jul 21, 2011

This is nothing but bssid of struct ath6kl.
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

70df0516

ath6kl: Cleanup parameters for wlan_refresh_inactive_nodes() · e4c7ffcb

Vasanthakumar Thiagarajan authored Jul 21, 2011

And remove the reference to wmi in ath6kl_node_table.
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

e4c7ffcb

ath6kl: Move scan table from wmi to ath6kl · 7c3075e9

Vasanthakumar Thiagarajan authored Jul 21, 2011

It does not need to be in wmi
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

7c3075e9

ath6kl: Cleanup void *parent_dev in struct wmi · 2865785e

Vasanthakumar Thiagarajan authored Jul 21, 2011

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

2865785e

ath6kl: change aggreation timeout message from an error to a debug message · 37ca6335

Kalle Valo authored Jul 21, 2011

When I connect to my Linksys WT610N AP supporting 11n I see a lot of
aggreation timeout errors:

[  408.885053] ath6kl: aggr timeout (st 3109 end 3140)
[  463.872108] ath6kl: aggr timeout (st 3671 end 3702)
[  495.010060] ath6kl: aggr timeout (st 3983 end 4014)
[  503.604047] ath6kl: aggr timeout (st 4065 end 0)
[  518.963047] ath6kl: aggr timeout (st 141 end 172)
[  525.014066] ath6kl: aggr timeout (st 205 end 236)
[  573.957051] ath6kl: aggr timeout (st 701 end 732)
[  585.019067] ath6kl: aggr timeout (st 816 end 847)

But still the connection seems to work. To not clutter the logs change
the error message to a debug message. But add a fixme comment so that
this will be investigated.
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

37ca6335

ath6kl: remove dependency to wireless extensions · f96efb5c

Kalle Valo authored Jul 21, 2011

ath6kl Kconfig still had dependencies to wext, remove those as they are
not needed anymore.

Now ath6kl should not have any wext code left. Time to have a beer and
celebrate this.
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

f96efb5c

ath6kl: fix crash when interface is closed but scan is ongoing · 6fd1eace

Kalle Valo authored Jul 21, 2011

When ath6kl module was removed while a scan was ongoing the driver would
crash in ath6kl_cfg80211_scan_complete_event().

Fix the function not to iterate nodes when the scan is aborted. The nodes
are already freed when the module is being unloaded. This patch removes the
null check entirely as the wmi structure is not accessed anymore during
module unload.

Also fix a bug where the status was checked as a bitfield with '&' operator.
But it's not a bitfield, just a regular error code.

This is a port of my patch from ath6kl staging with the same title.
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

6fd1eace

ath6kl: fix atomicity in ath6kl_cfg80211_scan_node() · cf104c2a

Kalle Valo authored Jul 21, 2011

ath6kl_cfg80211_scan_node() was calling cfg80211_inform_bss_frame()
with CFP_KERNEL but the function is executed with a spin lock taken.
This is wrong and the function must use GFP_ATOMIC instead.
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

cf104c2a

ath6kl: don't force foreground scan when connected · b2c76bbe

Kalle Valo authored Jul 21, 2011

In my setup data transfer stalls when there's data transmission during
scan. After some testing I found out that using background scan
when connected to makes the problem go away. This is more like
a workaround than a proper fix, but as the stall is so severe the
workaround is justified.

With a dual band card this increases scan time when connected from
1.9s to 4.4s. When not connected the scan time is not affected and
is the same 1.9s.
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

b2c76bbe

ath6kl: Use bit field macros to maintain wlan enabled and disabled status · 575b5f34
Raja Mani authored Jul 19, 2011
```
Signed-off-by: Raja Mani <rmani@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
```
575b5f34

ath6kl: Avoid two memset to clear src and desr mac addr variable memory in... · c8790cba

Raja Mani authored Jul 19, 2011

ath6kl: Avoid two memset to clear src and desr mac addr variable memory in ath6kl_wmi_dot11_hdr_remove()
Signed-off-by: Raja Mani <rmani@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

c8790cba

ath6kl: Rearrange the variable and the value position in IF condition · 5ba3ee48
Raja Mani authored Jul 19, 2011
```
Signed-off-by: Raja Mani <rmani@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
```
5ba3ee48
ath6kl: Print bad trailer data only when htc fails to parse trailer info · 2588f554
Raja Mani authored Jul 19, 2011
```
Signed-off-by: Raja Mani <rmani@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
```
2588f554

ath6kl: Remove unused struct ath6kl_async_reg_io_buffer · 58d92abc

Vasanthakumar Thiagarajan authored Jul 18, 2011

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

58d92abc

ath6kl: Move chk_irq_status_cnt from ath6kl_device to htc_target · fcb82058
Vasanthakumar Thiagarajan authored Jul 18, 2011
```
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
```
fcb82058

ath6kl: Bypass reading irq status based on chk_irq_status_cnt · 7520ceb7

Vasanthakumar Thiagarajan authored Jul 18, 2011

This is a regression.
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

7520ceb7

ath6kl: Move scatter information from ath6kl_device to htc_target · 50745af7
Vasanthakumar Thiagarajan authored Jul 18, 2011
```
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
```
50745af7
ath6kl: Move block_sz and block_mask from ath6kl_device to htc_target · 5be8824f
Vasanthakumar Thiagarajan authored Jul 18, 2011
```
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
```
5be8824f

ath6kl: Move bundle size from ath6kl_device to htc_target · 3b2f5e51

Vasanthakumar Thiagarajan authored Jul 18, 2011

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

3b2f5e51

ath6kl: Remove callback msg_pending() and used the function directly · df45f7f9
Vasanthakumar Thiagarajan authored Jul 18, 2011
```
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
```
df45f7f9

ath6kl: Minor cleanup in ath6kldev_submit_scat_req() · 23b7840a

Vasanthakumar Thiagarajan authored Jul 18, 2011

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

23b7840a

ath6kl: Remove ath6kldev_setup_msg_bndl() · ca06cadb

Vasanthakumar Thiagarajan authored Jul 16, 2011

Use appropriate hif function directly.
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

ca06cadb

ath6kl: Merge scatter rw request functions into one · 348a8fbc

Vasanthakumar Thiagarajan authored Jul 16, 2011

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

348a8fbc

ath6kl: Refactor ath6kl_sdio_read_write_sync() · da220695

Vasanthakumar Thiagarajan authored Jul 16, 2011

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

da220695

ath6kl: Moe virt_scat from hif_dev_scat_sup_info to hif_scatter_req · 4a005c3e
Vasanthakumar Thiagarajan authored Jul 16, 2011
```
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
```
4a005c3e

ath6kl: Merge scatter gather setup functions for two method · cfeab10b

Vasanthakumar Thiagarajan authored Jul 16, 2011

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

cfeab10b

ath6kl: Move down scatter enable and cleanup functions · 18a0f93e

Vasanthakumar Thiagarajan authored Jul 16, 2011

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

18a0f93e

ath6kl: Cleanup ath6kl_sdio_cleanup_scatter() · ac2bba01

Vasanthakumar Thiagarajan authored Jul 16, 2011

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

ac2bba01

ath6kl: Cleanup ath6kl_sdio_enable_scatter() · def85c00

Vasanthakumar Thiagarajan authored Jul 16, 2011

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

def85c00

ath6kl: Refactor refactor ath6kl_sdio_setup_scat_resource() · 3df505ad

Vasanthakumar Thiagarajan authored Jul 16, 2011

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

3df505ad