Commit 7b21f00e authored Apr 18, 2011 by Johannes Berg Committed by Wey-Yi Guy Apr 18, 2011

iwlagn: verify that huge commands are synchronous



Since huge commands all share a single buffer,
there can only be a single one in flight at a
time since otherwise they'd overwrite each
other. This is true in the driver now, but it
seems like a possible source of bugs, so add
a test to verify that huge commands are always
sent synchronously.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

parent 3e41ace5

drivers/net/wireless/iwlwifi/iwl-tx.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -470,6 +470,14 @@ int iwl_enqueue_hcmd(struct iwl_priv priv, struct iwl_host_cmd cmd)
		return -EIO;
		}

		/*
		* As we only have a single huge buffer, check that the command
		* is synchronous (otherwise buffers could end up being reused).
		*/

		if (WARN_ON((cmd->flags & CMD_ASYNC) && (cmd->flags & CMD_SIZE_HUGE)))
		return -EINVAL;

		spin_lock_irqsave(&priv->hcmd_lock, flags);

		if (iwl_queue_space(q) < ((cmd->flags & CMD_ASYNC) ? 2 : 1)) {