diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-06 15:57:18 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-06 15:57:18 -0400 |
| commit | bfe34ebbaa125f00da309f59cc9d30febe1e3115 (patch) | |
| tree | 505b43fc81be09ec5b42f82a3e64f300a5e838d5 /drivers/net/wireless/iwlwifi/iwl-tx.c | |
| parent | 3d7ddd540b4c2d24c6a3e7a52c083a0c31e6151c (diff) | |
| parent | 6b4f645a491ac29c7dced415d034eea7736155a6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-tx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-tx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index 6bb9602f3477..288b871e974b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c | |||
| @@ -970,6 +970,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) | |||
| 970 | out_cmd = txq->cmd[idx]; | 970 | out_cmd = txq->cmd[idx]; |
| 971 | out_meta = &txq->meta[idx]; | 971 | out_meta = &txq->meta[idx]; |
| 972 | 972 | ||
| 973 | memset(out_meta, 0, sizeof(*out_meta)); /* re-initialize to NULL */ | ||
| 973 | out_meta->flags = cmd->flags; | 974 | out_meta->flags = cmd->flags; |
| 974 | if (cmd->flags & CMD_WANT_SKB) | 975 | if (cmd->flags & CMD_WANT_SKB) |
| 975 | out_meta->source = cmd; | 976 | out_meta->source = cmd; |