From a29e393ba989121db1fb9fcbb254fac4e421a582 Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Thu, 7 Jun 2012 14:23:06 +0300 Subject: [PATCH] --- yaml --- r: 314341 b: refs/heads/master c: 11741739391c2f03bbaba5349f868618fe63922f h: refs/heads/master i: 314339: d11f7fb3b74aa36268503848ed7ff95282803a4b v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/dvm/tx.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 52419073b5cd..8d98cc2f4bd8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5bf9a89d9a2eaa136a23d872db4195ca8cada4c8 +refs/heads/master: 11741739391c2f03bbaba5349f868618fe63922f diff --git a/trunk/drivers/net/wireless/iwlwifi/dvm/tx.c b/trunk/drivers/net/wireless/iwlwifi/dvm/tx.c index 0dfaf649b257..1f9457fdb933 100644 --- a/trunk/drivers/net/wireless/iwlwifi/dvm/tx.c +++ b/trunk/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);