Commit graph

557 commits

Author SHA1 Message Date
Dan Carpenter
8f019bfe0a Staging: rtl8192e: off by one in rtl8192_get_channel_map()
COUNTRY_CODE_MAX is not a valid country code.  We're off by one here.
This gets passed to Dot11d_Channelmap() where it's used as an offset
into the ChannelPlan[] array.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-26 17:26:03 -07:00
Larry Finger
a85fe2c626 staging: rtl8192e: Fix format warning
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06 16:53:38 -07:00
Larry Finger
d7613e535e staging: rtl8192e: Fix various problems noted by smatch
Smatch reports the following problems:

  CHECK   drivers/staging/rtl8192e/rtllib_softmac.c
drivers/staging/rtl8192e/rtllib_softmac.c +3143 rtllib_softmac_free(4) info: redundant null check on ieee->pDot11dInfo calling kfree()

  CHECK   drivers/staging/rtl8192e/rtllib_module.c
drivers/staging/rtl8192e/rtllib_module.c +198 free_rtllib(6) info: redundant null check on ieee->pHTInfo calling kfree()

  CHECK   drivers/staging/rtl8192e/rtl819x_TSProc.c
drivers/staging/rtl8192e/rtl819x_TSProc.c +280 SearchAdmitTRStream(52) error: potential null derefence 'pRet'.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06 16:36:00 -07:00
Larry Finger
2eed3dee92 staging: rtl8192e: Fix smatch warnings regarding large arrays on stack
Smatch reports the follwing warnings:

  CHECK   drivers/staging/rtl8192e/rtllib_rx.c
drivers/staging/rtl8192e/rtllib_rx.c +552 RxReorderIndicatePacket(6) warn: 'prxbIndicateArray' puts 1024 bytes on stack

  CHECK   drivers/staging/rtl8192e/rtl819x_TSProc.c
drivers/staging/rtl8192e/rtl819x_TSProc.c +40 RxPktPendingTimeout(9) warn: 'stats_IndicateArray' puts 1024 bytes on stack

  CHECK   drivers/staging/rtl8192e/r8192E_phy.c
drivers/staging/rtl8192e/r8192E_phy.c +859 rtl8192_phy_SwChnlStepByStep(11) warn: function puts 797 bytes on stack

  CHECK   drivers/staging/rtl8192e/rtllib_rx.c
drivers/staging/rtl8192e/rtllib_rx.c +552 RxReorderIndicatePacket(6) warn: 'prxbIndicateArray' puts 1024 bytes on stack

These are fixed by adding the arrays in question as a union in a struct used
by nearly all routines.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06 16:35:59 -07:00
Larry Finger
52a7fb0951 staging: rtl8192e: Fix smatch error in r8192E_phy.c
Smatch reports the following:

  CHECK   drivers/staging/rtl8192e/r8192E_phy.c
drivers/staging/rtl8192e/r8192E_phy.c +940 rtl8192_phy_SwChnlStepByStep(92) error: potential null derefence 'CurrentCmd'.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06 16:35:59 -07:00
Larry Finger
ce7b393f50 staging: rtl8192e: Fix smatch warning in rtl819x_BAProc.c
Smatch outputs the following warning:

  CHECK   drivers/staging/rtl8192e/rtl819x_BAProc.c
drivers/staging/rtl8192e/rtl819x_BAProc.c +88 rtllib_ADDBA(12) warn: variable dereferenced before check 'ieee'

As ieee cannot be NULL at this point, remove all such checks.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06 16:35:58 -07:00
Larry Finger
a07663eddb staging: rtl8192e: Silence smatch info in r8192E_cmdpkt.c
Smatch outputs the following informational message:

  CHECK   drivers/staging/rtl8192e/r8192E_cmdpkt.c
drivers/staging/rtl8192e/r8192E_cmdpkt.c +419 cmpk_message_handle_rx(77) info: ignoring unreachable code.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06 16:35:57 -07:00
Larry Finger
e25316a08e staging: rtl8192e: Fix smatch warning in rtl_wx.c
Smatch reports the following warning:

  CHECK   drivers/staging/rtl8192e/rtl_wx.c

drivers/staging/rtl8192e/rtl_wx.c +262 r8192se_wx_set_radio(16) warn: inconsistent returns sem:&priv->wx_sem: locked (258) unlocked (262)

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06 16:35:57 -07:00
Larry Finger
77a04453eb staging: rtl8192e: Fix smatch info output for r8192E_dev.c
Smatch reports the following informational output:

  CHECK   drivers/staging/rtl8192e/r8192E_dev.c
drivers/staging/rtl8192e/r8192E_dev.c +2404 ActUpdateChannelAccessSetting(13) info: ignoring unreachable code.
drivers/staging/rtl8192e/r8192E_dev.c +2404 ActUpdateChannelAccessSetting(13) info: ignoring unreachable code.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06 16:35:57 -07:00
Larry Finger
35f8673d11 staging: rtl8192e: Fix smatch error and warning in rtl_core.c
Smatch shows the following errors:

  CHECK   drivers/staging/rtl8192e/rtl_core.c
drivers/staging/rtl8192e/rtl_core.c +600 rtl8192_qos_activate(7) warn: variable dereferenced before check 'priv'
drivers/staging/rtl8192e/rtl_core.c +1345 rtl8192_init(40) warn: 'dev->irq' was not released on error
drivers/staging/rtl8192e/rtl_core.c +2120 rtl8192_alloc_rx_desc_ring(43) error: potential null derefence 'entry'.
drivers/staging/rtl8192e/rtl_core.c +3010 rtl8192_pci_probe(153) warn: 'pmem_start' was not released on error

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06 16:35:56 -07:00
Larry Finger
aa9af000a3 staging: rtl8192e: Remove dead code involving MOVE_INTO_HANDLER
File rtl_core.c contains the statement "#define MOVE_INTO_HANDLER". As a
result, everything inside an "ifndef MOVE_INTO_HANDLER" is dead code and
can be removed.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06 16:35:56 -07:00
Randy Dunlap
939161571c staging: fix rtl8192e build errors
drivers/staging/rtl8192e/rtllib.h:2329: error: field 'wx_sem' has incomplete type
drivers/staging/rtl8192e/rtllib.h:2330: error: field 'scan_sem' has incomplete type
drivers/staging/rtl8192e/rtllib.h:2331: error: field 'ips_sem' has incomplete type
drivers/staging/rtl8192e/rtllib_wx.c:267: error: implicit declaration of function 'down'
drivers/staging/rtl8192e/rtllib_wx.c:290: error: implicit declaration of function 'up'
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-06 11:46:20 -07:00
Larry Finger
a504de3a1e staging: rtl8192e: Fix array overrun
Smatch outputs the following message:

drivers/staging/rtl8192e/r8192E_cmdpkt.c +412 cmpk_message_handle_rx(70)
	error: buffer overflow 'priv->stats.rxcmdpkt' 4 <= 7

   407                          RT_TRACE(COMP_CMDPKT, "---->cmpk_message_handle_rx():"
   408                                   "unknow CMD Element\n");
   409                          return 1;
   410                  }
   411
   412                  priv->stats.rxcmdpkt[element_id]++;
                                             ^^^^^^^^^^
->stats.rxcmdpkt[] only has 4 elements, but from the switch statement
in the section before we can see that element_id can go up to 7
(RX_TX_RATE_HISTORY).

Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-29 10:58:00 -07:00
Greg Kroah-Hartman
280bdcad85 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/r8192E into staging-next
* git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/r8192E: (25 commits)
  rtl8192e: update for ndo_set_multicast_list removal.
  staging: rtl8192e: Add endian checking switch to Makefile
  staging: rtl8192e: Fix sparse (non-endian) warnings - Part II
  staging: rtl8192e: Fix sparse (non-endian) messages - Part I
  staging: rtl8192e: Remove MAC_FMT and MAC_ARG for %pM
  staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVIII
  staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVII
  staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVI
  staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XV
  staging: rtl8192e: Cleanup checkpatch -f errors - Part XIV
  staging: rtl8192e: Cleanup checkpatch -f errors - Part XIII
  staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XII
  staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XI
  staging: rtl8192e: Cleanup checkpatch -f errors - Part X
  staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IX
  staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VIII
  staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VII
  staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VI
  staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part V
  staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IV
  ...
2011-08-26 10:50:09 -07:00
Stephen Rothwell
faae60d232 rtl8192e: update for ndo_set_multicast_list removal.
After merging the staging tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/staging/rtl8192e/rtl_core.c:2917:2: error: unknown field 'ndo_set_multicast_list' specified in initializer

Caused by commit 94a799425e ("From: wlanfae <wlanfae@realtek.com>" -
really "[PATCH 1/8] rtl8192e: Import new version of driver from realtek"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-26 01:13:34 -05:00
Larry Finger
f00c5460b4 staging: rtl8192e: Add endian checking switch to Makefile
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 15:36:35 -07:00
Larry Finger
49aab5fd9d staging: rtl8192e: Fix sparse (non-endian) warnings - Part II
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 15:36:35 -07:00
Larry Finger
ec0dc6beea staging: rtl8192e: Fix sparse (non-endian) messages - Part I
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 15:36:34 -07:00
Larry Finger
ac50ddaaee staging: rtl8192e: Remove MAC_FMT and MAC_ARG for %pM
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 15:36:34 -07:00
Larry Finger
c73298e6c4 staging: rtl8192e: Add endian checking switch to Makefile
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 12:41:19 -05:00
Larry Finger
fec90b64db staging: rtl8192e: Fix sparse (non-endian) warnings - Part II
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 12:41:12 -05:00
Larry Finger
966aeb321c staging: rtl8192e: Fix sparse (non-endian) messages - Part I
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 12:41:05 -05:00
Larry Finger
438812c3ec staging: rtl8192e: Remove MAC_FMT and MAC_ARG for %pM
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 12:40:55 -05:00
Larry Finger
08d348a021 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVIII
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:16 -07:00
Larry Finger
62f27cc4ae staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVII
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:15 -07:00
Larry Finger
f38d223b69 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVI
This patch removes all the errors and most of the warnings generated by
checkpatch -f for rtllib_softmac_tx.c..

    Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:15 -07:00
Larry Finger
a44be772cb staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XV
This patch removes all the errors and warnings generated by
checkpatch -f for rtllib_softmac_wx.c..

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:14 -07:00
Larry Finger
9d92ece80d staging: rtl8192e: Cleanup checkpatch -f errors - Part XIV
With this patch, all of the checkpatch errors are fixed; however, only
some of the lines that are too long were fixed. To complete the fixing
of these warnings, the file rtllib_softmac.c will need refactoring. In addition,
some of the variables may need renaming. Those changes can be deferred.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:14 -07:00
Larry Finger
db8971b618 staging: rtl8192e: Cleanup checkpatch -f errors - Part XIII
With this patch, all of the checkpatch errors are fixed; however, only
some of the lines that are too long were fixed. To complete the fixing
of these warnings, the file rtl_dm.c will need refactoring. In addition,
some of the variables will need renaming. Those changes can be deferred.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:14 -07:00
Larry Finger
8567829a6c staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XII
This patch removes all the errors and most of the warnings generated by
checkpatch -f.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:13 -07:00
Larry Finger
a44325f985 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XI
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:13 -07:00
Larry Finger
b448b0cc13 staging: rtl8192e: Cleanup checkpatch -f errors - Part X
With this patch, all of the checkpatch errors are fixed; however, only
some of the lines that are too long were fixed. To complete the fixing
of these warnings, the file rtl_dm.c will need refactoring. In addition,
some of the variables will need renaming. Those changes can be deferred.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:12 -07:00
Larry Finger
cffa5bd956 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IX
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:12 -07:00
Larry Finger
1344ee2591 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VIII
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:12 -07:00
Larry Finger
b6da7313e0 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VII
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:11 -07:00
Larry Finger
f88ec6cbc1 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VI
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:11 -07:00
Larry Finger
831cb9db38 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part V
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:10 -07:00
Larry Finger
547d0c34b7 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part IV
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:10 -07:00
Larry Finger
11632a0eed staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part III
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:10 -07:00
Larry Finger
526294770c staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part II
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:10 -07:00
Larry Finger
55dc4eb35f staging: rtl8192e: Remove extraneous log message
The driver logs all DHCP transactions and thus spams the logs.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:09 -07:00
Larry Finger
0dd565069b staging: rtl8192e: Modify time handling
In several places, the driver keeps times (in jiffies) in two 32-bit
quantities. In the rtl8192_hw_to_sleep(), there is an error in the
calculation of the difference between two 64-bit quantities. Rather
than fix that error, I have converted to a single 64-bit number. That
makes the code be much cleaner and clearer.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:09 -07:00
Larry Finger
ac513a88a0 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part I
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-25 10:05:08 -07:00
Larry Finger
8bd890a41f staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVIII
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 11:22:31 -05:00
Larry Finger
c73901c9fd staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVII
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 11:22:31 -05:00
Larry Finger
94fa3e89b4 staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XVI
This patch removes all the errors and most of the warnings generated by
checkpatch -f for rtllib_softmac_tx.c..

    Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 11:22:30 -05:00
Larry Finger
755f3a84cf staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XV
This patch removes all the errors and warnings generated by
checkpatch -f for rtllib_softmac_wx.c..

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 11:22:30 -05:00
Larry Finger
3927ee3600 staging: rtl8192e: Cleanup checkpatch -f errors - Part XIV
With this patch, all of the checkpatch errors are fixed; however, only
some of the lines that are too long were fixed. To complete the fixing
of these warnings, the file rtllib_softmac.c will need refactoring. In addition,
some of the variables may need renaming. Those changes can be deferred.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 11:22:29 -05:00
Larry Finger
87d30617c6 staging: rtl8192e: Cleanup checkpatch -f errors - Part XIII
With this patch, all of the checkpatch errors are fixed; however, only
some of the lines that are too long were fixed. To complete the fixing
of these warnings, the file rtl_dm.c will need refactoring. In addition,
some of the variables will need renaming. Those changes can be deferred.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 11:22:28 -05:00
Larry Finger
d57429f05e staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part XII
This patch removes all the errors and most of the warnings generated by
checkpatch -f.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-25 11:22:28 -05:00