projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
mvm
/
tx.c
diff --git
a/drivers/net/wireless/iwlwifi/mvm/tx.c
b/drivers/net/wireless/iwlwifi/mvm/tx.c
index
d62a6d3
..
e05440d
100644
(file)
--- a/
drivers/net/wireless/iwlwifi/mvm/tx.c
+++ b/
drivers/net/wireless/iwlwifi/mvm/tx.c
@@
-122,6
+122,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);
* 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;
}
} else {
tx_cmd->pm_frame_timeout = 0;
}
@@
-170,7
+172,7
@@
static void iwl_mvm_set_tx_cmd_rate(struct iwl_mvm *mvm,
}
/*
}
/*
- * for data packets, rate info comes from the table inside he fw. This
+ * for data packets, rate info comes from the table inside
t
he fw. This
* table is controlled by LINK_QUALITY commands
*/
* table is controlled by LINK_QUALITY commands
*/