From: David S. Miller Date: Tue, 13 Oct 2015 02:39:18 +0000 (-0700) Subject: Merge tag 'wireless-drivers-next-for-davem-2015-10-09' of git://git.kernel.org/pub... X-Git-Tag: KARO-TX6UL-2015-11-03~90^2~124 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=991659674288dba28c2f5a3d1a0133ef4d20824a;p=karo-tx-linux.git Merge tag 'wireless-drivers-next-for-davem-2015-10-09' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next Kalle Valo says: ==================== Major changes: iwlwifi * some debugfs improvements * fix signedness in beacon statistics * deinline some functions to reduce size when device tracing is enabled * filter beacons out in AP mode when no stations are associated * deprecate firmwares version -12 * fix a runtime PM vs. legacy suspend race * one-liner fix for a ToF bug * clean-ups in the rx code * small debugging improvement * fix WoWLAN with new firmware versions * more clean-ups towards multiple RX queues; * some rate scaling fixes and improvements; * some time-of-flight fixes; * other generic improvements and clean-ups; brcmfmac * rework code dealing with multiple interfaces * allow logging firmware console using debug level * support for BCM4350, BCM4365, and BCM4366 PCIE devices * fixed for legacy P2P and P2P device handling * correct set and get tx-power ath9k * add support for Outside Context of a BSS (OCB) mode mwifiex * add USB multichannel feature ==================== Signed-off-by: David S. Miller --- 991659674288dba28c2f5a3d1a0133ef4d20824a diff --cc drivers/net/wireless/mwifiex/11n_aggr.c index 78853c51774d,2c5ffa13f7b5..aa498e0d2204 --- a/drivers/net/wireless/mwifiex/11n_aggr.c +++ b/drivers/net/wireless/mwifiex/11n_aggr.c @@@ -201,8 -202,10 +201,9 @@@ mwifiex_11n_aggregate_pkt(struct mwifie tx_info_aggr->flags |= MWIFIEX_BUF_FLAG_TDLS_PKT; tx_info_aggr->flags |= MWIFIEX_BUF_FLAG_AGGR_PKT; skb_aggr->priority = skb_src->priority; + skb_aggr->tstamp = skb_src->tstamp; - do_gettimeofday(&tv); - skb_aggr->tstamp = timeval_to_ktime(tv); + skb_aggr->tstamp = ktime_get_real(); do { /* Check if AMSDU can accommodate this MSDU */