diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-21 12:57:56 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-21 12:57:56 -0500 |
| commit | b3117494772d8f906625905c6e203af745ee3530 (patch) | |
| tree | cc8960455f9e1f18d0939fddd0e96f349613f753 /drivers/net/wireless/iwlwifi/dvm/main.c | |
| parent | e2ff0498409af6f2023f91aba07b281e5e87ee15 (diff) | |
| parent | 400e020892a9a20eea5d2c9bce8bfb312075c4ba (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/iwlwifi/pcie/tx.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/main.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c index 03cbfa765f87..37bb4575ad8d 100644 --- a/drivers/net/wireless/iwlwifi/dvm/main.c +++ b/drivers/net/wireless/iwlwifi/dvm/main.c | |||
| @@ -2107,7 +2107,7 @@ static void iwl_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb) | |||
| 2107 | 2107 | ||
| 2108 | info = IEEE80211_SKB_CB(skb); | 2108 | info = IEEE80211_SKB_CB(skb); |
| 2109 | iwl_trans_free_tx_cmd(priv->trans, info->driver_data[1]); | 2109 | iwl_trans_free_tx_cmd(priv->trans, info->driver_data[1]); |
| 2110 | dev_kfree_skb_any(skb); | 2110 | ieee80211_free_txskb(priv->hw, skb); |
| 2111 | } | 2111 | } |
| 2112 | 2112 | ||
| 2113 | static void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state) | 2113 | static void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state) |