Return-path: Received: from he.sipsolutions.net ([78.46.109.217]:48534 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751330Ab2FKJxe (ORCPT ); Mon, 11 Jun 2012 05:53:34 -0400 From: Johannes Berg To: linux-wireless@vger.kernel.org Cc: Emmanuel Grumbach Subject: [PATCH 09/13] iwlwifi: comment that setting driver_data overrides info->control Date: Mon, 11 Jun 2012 11:53:08 +0200 Message-Id: <1339408392-19425-10-git-send-email-johannes@sipsolutions.net> (sfid-20120611_115348_383136_EB75CEA0) In-Reply-To: <1339408392-19425-1-git-send-email-johannes@sipsolutions.net> References: <1339408392-19425-1-git-send-email-johannes@sipsolutions.net> Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Emmanuel Grumbach Using the driver_data area in ieee80211_tx_info which resides in the CB overrides the info->control field. Add a comment to prevent mistakes. Signed-off-by: Emmanuel Grumbach Signed-off-by: Johannes Berg --- drivers/net/wireless/iwlwifi/dvm/tx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c index 0dfaf64..1f9457f 100644 --- a/drivers/net/wireless/iwlwifi/dvm/tx.c +++ b/drivers/net/wireless/iwlwifi/dvm/tx.c @@ -403,6 +403,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) info->driver_data[0] = ctx; info->driver_data[1] = dev_cmd; + /* From now on, we cannot access info->control */ spin_lock(&priv->sta_lock); -- 1.7.10