UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iwlwifi: remove late null-check and duplicate bug_on 

These pieces of code appear to be useless. The BUG_ON is also performed in
iwl_send_cmd_async.

Serious karma would be needed to enter iwl_ativate_qos with a null priv.
I had a deja vu when patching this, but for the life of me I couldn't track
down a similar patch.

Signed-off-by: Ian Schram <ischram@telenet.be>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Ian Schram 2007-10-25 17:15:30 +08:00 committed by David S. Miller
parent bc434dd296
commit 3edb059a40
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/wireless/iwlwifi/iwl3945-base.c
View File

@ -808,10 +808,6 @@ out:
int iwl_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) int iwl_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
{ {
/* A command can not be asynchronous AND expect an SKB to be set. */
BUG_ON((cmd->meta.flags & CMD_ASYNC) &&
(cmd->meta.flags & CMD_WANT_SKB));
if (cmd->meta.flags & CMD_ASYNC) if (cmd->meta.flags & CMD_ASYNC)
return iwl_send_cmd_async(priv, cmd); return iwl_send_cmd_async(priv, cmd);
@ -1968,9 +1964,6 @@ static void iwl_activate_qos(struct iwl_priv *priv, u8 force)
{ {
unsigned long flags; unsigned long flags;
if (priv == NULL)
return;
if (test_bit(STATUS_EXIT_PENDING, &priv->status)) if (test_bit(STATUS_EXIT_PENDING, &priv->status))
return; return;

7
drivers/net/wireless/iwlwifi/iwl4965-base.c
View File

@ -806,10 +806,6 @@ out:
int iwl_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) int iwl_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
{ {
/* A command can not be asynchronous AND expect an SKB to be set. */
BUG_ON((cmd->meta.flags & CMD_ASYNC) &&
(cmd->meta.flags & CMD_WANT_SKB));
if (cmd->meta.flags & CMD_ASYNC) if (cmd->meta.flags & CMD_ASYNC)
return iwl_send_cmd_async(priv, cmd); return iwl_send_cmd_async(priv, cmd);
@ -2040,9 +2036,6 @@ static void iwl_activate_qos(struct iwl_priv *priv, u8 force)
{ {
unsigned long flags; unsigned long flags;
if (priv == NULL)
return;
if (test_bit(STATUS_EXIT_PENDING, &priv->status)) if (test_bit(STATUS_EXIT_PENDING, &priv->status))
return; return;