David S. Miller
e1ea2f9856
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Several conflicts here.
NFP driver bug fix adding nfp_netdev_is_nfp_repr() check to
nfp_fl_output() needed some adjustments because the code block is in
an else block now.
Parallel additions to net/pkt_cls.h and net/sch_generic.h
A bug fix in __tcp_retransmit_skb() conflicted with some of
the rbtree changes in net-next.
The tc action RCU callback fixes in 'net' had some overlap with some
of the recent tcf_block reworking.
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-30 21:09:24 +09:00
mac80211: use crypto_aead_authsize()
2017-10-11 15:46:45 +02:00
mac80211: aead api to reduce redundancy
2017-10-11 09:37:35 +02:00
mac80211: aead api to reduce redundancy
2017-10-11 09:37:35 +02:00
mac80211: aead api to reduce redundancy
2017-10-11 09:37:35 +02:00
mac80211: add documentation to ieee80211_rx_ba_offl()
2017-09-21 11:42:00 +02:00
mac80211: agg-tx: call drv_wake_tx_queue in proper context
2017-09-05 16:25:07 +02:00
mac80211: validate user rate mask before configuring driver
2017-10-18 09:39:56 +02:00
networking: convert many more places to skb_put_zero()
2017-06-16 11:48:35 -04:00
mac80211: Dynamically set CoDel parameters per station
2017-05-17 16:03:40 +02:00
mac80211: Simplify locking in ieee80211_sta_tear_down_BA_sessions()
2017-09-21 11:42:01 +02:00
networking: introduce and use skb_put_data()
2017-06-16 11:48:37 -04:00
mac80211: only remove AP VLAN frames from TXQ
2017-10-11 09:49:40 +02:00
mac80211: only remove AP VLAN frames from TXQ
2017-10-11 09:49:40 +02:00
mac80211: don't compare TKIP TX MIC key in reinstall prevention
2017-10-25 11:04:45 +02:00
mac80211: aead api to reduce redundancy
2017-10-11 09:37:35 +02:00
mac80211: use offsetofend()
2017-09-21 11:42:01 +02:00
net/mac80211/mesh_plink: Convert timers to use timer_setup()
2017-10-06 11:47:52 +02:00
mac80211: use offsetofend()
2017-09-21 11:42:01 +02:00
net/mac80211/mesh_plink: Convert timers to use timer_setup()
2017-10-06 11:47:52 +02:00
networking: make skb_put & friends return void pointers
2017-06-16 11:48:39 -04:00
mac80211: don't track HT capability changes
2017-10-13 14:29:02 +02:00
mac80211: flush hw_roc_start work before cancelling the ROC
2017-09-05 16:25:07 +02:00
cfg80211: add request id to cfg80211_sched_scan_*() api
2017-04-28 14:51:43 +02:00
mac80211: Dynamically set CoDel parameters per station
2017-05-17 16:03:40 +02:00
mac80211: make rate control tx status API more extensible
2017-04-28 10:57:33 +02:00
mac80211: make rate control tx status API more extensible
2017-04-28 10:57:33 +02:00
mac80211: make rate control tx status API more extensible
2017-04-28 10:57:33 +02:00
networking: make skb_push & __skb_push return void pointers
2017-06-16 11:48:40 -04:00
mac80211: oce: enable receiving of bcast probe resp
2017-09-21 11:42:00 +02:00
networking: convert many more places to skb_put_zero()
2017-06-16 11:48:35 -04:00
net/mac80211/mesh_plink: Convert timers to use timer_setup()
2017-10-06 11:47:52 +02:00
net/mac80211/mesh_plink: Convert timers to use timer_setup()
2017-10-06 11:47:52 +02:00
networking: make skb_push & __skb_push return void pointers
2017-06-16 11:48:40 -04:00
net: manual clean code which call skb_put_[data:zero]
2017-06-20 13:30:15 -04:00
mac80211: add the action to the drv_ampdu_action tracepoint
2017-06-13 11:06:39 +02:00
mac80211: only remove AP VLAN frames from TXQ
2017-10-11 09:49:40 +02:00
mac80211: use offsetofend()
2017-09-21 11:42:01 +02:00
mac80211: fix bandwidth computation for TDLS peers
2017-10-02 14:06:19 +02:00
mac80211: aead api to reduce redundancy
2017-10-11 09:37:35 +02:00
e1ea2f9856