lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
276,246 Commits 1 Branch 0 Tags 2.7 GiB
a96b724d5a
Commit Graph

169 Commits

Author SHA1 Message Date
Thomas Meyer
2b50b8f588 iwlegacy: Use kcalloc instead of kzalloc to allocate array 
The advantage of kcalloc is, that will prevent integer overflows which could
result from the multiplication of number of elements and size and it is also
a bit nicer to read.

The semantic patch that makes this change is available
in https://lkml.org/lkml/2011/11/25/107

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
 2011-12-06 16:05:24 -05:00
John W. Linville
515db09338 Merge branch 'master' of 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-22 14:05:46 -05:00
Greg Dietsche
9b5e2f463a iwlegacy: debugfs_ops should depend on CONFIG_IWLEGACY_DEBUGFS 
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-16 12:55:12 +01:00
Greg Dietsche
e3a2c77533 iwlegacy: 4965-rs: cleanup il4965_rs_sta_dbgfs_rate_scale_data_read 
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-16 12:54:56 +01:00
Greg Dietsche
a741b99577 iwlegacy: 4965-rs: don't return rate from il4965_rs_update_rate_tbl 
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-16 12:53:45 +01:00
Greg Dietsche
3e4b065520 iwlegacy: 4965-rs: il4965_rs_alloc_sta: remove lq_sta local var 
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-16 12:53:16 +01:00
Greg Dietsche
144c0961b4 iwlegacy: 4965-rs: remove unnecessary null check for sta and lq_sta 
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-16 12:52:59 +01:00
Greg Dietsche
da6134d253 iwlegacy: 4965-rs: remove null check on sta in il4965_rs_tx_status 
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-16 12:52:21 +01:00
Greg Dietsche
730b4c2102 iwlegacy: 4965: remove vif null check in request_scan 
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-16 12:51:15 +01:00
Stanislaw Gruszka
c63b2d01b1 iwlegacy: remove unused IL_AC_UNSET define 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 15:20:03 +01:00
Greg Dietsche
dd44eb9e13 iwlegacy: change IL_ERR to D_HT in iwl4965_rs_tl_turn_on_agg_for_tid 
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-15 14:51:46 +01:00
Greg Dietsche
53611e0526 iwlegacy: change IL_WARN to D_HT in il4965_tx_agg_start 
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-15 14:51:44 +01:00
Stanislaw Gruszka
1722f8e12a iwlegacy: checkpatch.pl fixes 
Fix most checkpatch.pl ERRORs and some WARNINGs.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 14:51:01 +01:00
Stanislaw Gruszka
e7392364fc iwlegacy: indentions and whitespaces 
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-15 14:45:59 +01:00
Stanislaw Gruszka
f02579e3a8 iwlegacy: merge iwl-debug.h into common.h 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 14:25:21 +01:00
Stanislaw Gruszka
f19ab370a7 iwlegacy: rename iwl-debug.c to debug.c 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 14:24:36 +01:00
Stanislaw Gruszka
eac3b21277 iwlegacy: merge iwl-fh.h into 4965.h 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 14:21:11 +01:00
Stanislaw Gruszka
9a95b37015 iwlegacy: use FH49_ prefix in 4965 code 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 14:20:39 +01:00
Stanislaw Gruszka
53143a1809 iwlegacy: use FH39_ prefix in 3945 code 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 14:20:33 +01:00
Stanislaw Gruszka
e8c39d4e62 iwlegacy: rename iwl-prph.h to prph.h 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 14:20:27 +01:00
Stanislaw Gruszka
47ef694dd4 iwlegacy: merge iwl-{eeprom,led}.h into common.h 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 14:20:23 +01:00
Stanislaw Gruszka
99412002a0 iwlegacy: merge iwl-power.h into common.h 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 14:20:19 +01:00
Stanislaw Gruszka
3fbbf9a808 iwlegacy: merge iwl-legacy-rs.h into common.h 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 14:20:16 +01:00
Stanislaw Gruszka
f44cfaf330 iwlegacy: remove iwl-helpers.h 
This file was already merged into common.h

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 14:20:13 +01:00
Stanislaw Gruszka
e94a4099ad iwlegacy: merge common header files 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 14:20:09 +01:00
Stanislaw Gruszka
98613be06e iwlegacy: rename iwl-core.h to common.h 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 14:19:34 +01:00
Stanislaw Gruszka
77375bb01c iwlegacy: rename iwl-csr.h to csr.h 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 14:12:12 +01:00
Stanislaw Gruszka
e53aac4247 iwlegacy: move IL_MASK 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 14:12:06 +01:00
Stanislaw Gruszka
6278ddab9f iwlegacy: remove il_ieee80211_get_hw_conf 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 14:12:00 +01:00
Stanislaw Gruszka
d4459a99c4 iwlegacy: rename iwl-commands.h to commands.h 
On the way remove also not needed iwl-fh.h include.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 13:51:26 +01:00
Stanislaw Gruszka
7f8e122380 iwlegacy: rename module name 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 13:42:04 +01:00
Stanislaw Gruszka
0cdc21363c iwlegacy: merge common .c files 
Merge iwl-{tx,rx,sta,scan,power,eeprom,led,hcmd}.c into common.c .

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 13:40:15 +01:00
Stanislaw Gruszka
4ed47911a2 iwlegacy: rename iwl-core.c to common.c 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 13:18:51 +01:00
Stanislaw Gruszka
d2dfb33ec9 iwlegacy: rename other handlers 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 13:16:38 +01:00
Stanislaw Gruszka
6e9848b496 iwlegacy: s/rx_reply/hdl/ 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 13:12:28 +01:00
Stanislaw Gruszka
d0c72347be iwlegacy: s/rx_handler/handler/ 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 13:12:24 +01:00
Stanislaw Gruszka
4d69c7521a iwlegacy: rename REPLY_ to N_ or C_ 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 13:12:21 +01:00
Stanislaw Gruszka
db7746f78c iwlegacy: s/STATISTICS/STATS/ 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 13:11:50 +01:00
Stanislaw Gruszka
a6766ccdaf iwlegacy: s/STATUS_/S_/ 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 13:09:01 +01:00
Stanislaw Gruszka
6bbb1370c3 iwlegacy: move iwl-3945-{,hw,fh,debugfs}.h to 3945.h 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 12:59:59 +01:00
Stanislaw Gruszka
af038f404f iwlegacy: move iwl-4965-{,hw,debugfs,calib}.h to 4965.h 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 12:59:02 +01:00
Stanislaw Gruszka
8f29b456f8 iwlegacy: add accidentally removed comments 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 12:57:25 +01:00
Stanislaw Gruszka
ccf5533ec4 iwlegacy: rename iwl-3945-{rs,debugfs}.c to 3945-{rs,debug}.c 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 12:54:28 +01:00
Stanislaw Gruszka
f3a1b49d66 iwlegacy: rename iwl-4965-{rs,calib,debugfs}.c to 4965-{rs,calib,debug}.c 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 12:54:25 +01:00
Stanislaw Gruszka
fcb74588dc iwlegacy: merge iwl-4965-lib.c into 4965-mac.c 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 12:54:18 +01:00
Stanislaw Gruszka
a1751b22a8 iwlegacy: merge iwl-4965-{tx,rx}.c into 4965-mac.c 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 12:50:37 +01:00
Stanislaw Gruszka
eb3cdfb72d iwlegacy: merge iwl-4965-sta.c into 4965-mac.c 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 12:41:56 +01:00
Stanislaw Gruszka
862d32e6db iwlegacy: merge iwl-4965-ucode.c into 4965.c 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 12:41:53 +01:00
Stanislaw Gruszka
56e7a8cca0 iwlegacy: merge iwl-4965-eeprom.c into 4965.c 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 12:41:50 +01:00
Stanislaw Gruszka
ecce1f09e8 iwlegacy: merge iwl-3945-led.c into 3945.c 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
 2011-11-15 12:41:31 +01:00