diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-02 15:37:34 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-02 15:37:34 -0400 |
| commit | 204162296edf0d0ac3e4dfd5bd0cac4af731b583 (patch) | |
| tree | fdf941fd23fae6097500db4998d4ca96467fc352 /drivers/net/wireless/iwlwifi/mvm/tx.c | |
| parent | e3d5291436ff9efeeb968459724af5332305dded (diff) | |
| parent | 147fc9be81d10e6e863323c0b54e140b42fd1ed6 (diff) | |
| download | op-kernel-dev-204162296edf0d0ac3e4dfd5bd0cac4af731b583.zip op-kernel-dev-204162296edf0d0ac3e4dfd5bd0cac4af731b583.tar.gz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/tx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/tx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c index f0e96a9..7694b8f 100644 --- a/drivers/net/wireless/iwlwifi/mvm/tx.c +++ b/drivers/net/wireless/iwlwifi/mvm/tx.c @@ -123,6 +123,8 @@ static void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb, * it */ WARN_ON_ONCE(info->flags & IEEE80211_TX_CTL_AMPDU); + } else if (skb->protocol == cpu_to_be16(ETH_P_PAE)) { + tx_cmd->pm_frame_timeout = cpu_to_le16(2); } else { tx_cmd->pm_frame_timeout = 0; } |
