aboutsummaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAge
* Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-11-26
|\
| * cfg80211: fix some tracing output issuesJohannes Berg2012-11-26
| * mac80211: support VHT rates in TX infoJohannes Berg2012-11-26
| * mac80211: support drivers reporting VHT RXJohannes Berg2012-11-26
| * nl80211/cfg80211: add VHT MCS supportJohannes Berg2012-11-26
| * mac80211: convert to channel definition structJohannes Berg2012-11-26
| * nl80211/cfg80211: support VHT channel configurationJohannes Berg2012-11-26
| * cfg80211: pass a channel definition structJohannes Berg2012-11-26
| * cfg80211: remove remain-on-channel channel typeJohannes Berg2012-11-26
| * mac80211: fix managed mode channel flags handlingJohannes Berg2012-11-26
| * mac80211: remove mesh config macros from mesh_plink.cMarco Porsch2012-11-26
| * mac80211: refactor ieee80211_set_qos_hdrMarco Porsch2012-11-26
| * mac80211: move Mesh Capability field definition to ieee80211.hMarco Porsch2012-11-26
| * mac80211: in ADHOC print debug message for every Auth messageAntonio Quartulli2012-11-26
| * mac80211: in ADHOC don't update last_rx if sta is not authorizedAntonio Quartulli2012-11-26
| * cfg80211: change function signature of cfg80211_get_p2p_attr()Arend van Spriel2012-11-26
| * cfg80211: use DS or HT operation IEs to determine BSS channelJohannes Berg2012-11-23
| * mac80211: disable HT advertising unless AP supports itJohannes Berg2012-11-23
| * mac80211: rename IEEE80211_STA_DISABLE_11N to HTJohannes Berg2012-11-23
| * mac80211: fix RX chains configurationJohannes Berg2012-11-23
| * mac80211: fix radiotap vendor area skippingJohannes Berg2012-11-23
* | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-11-21
|\|
| * mac80211: Add debugfs callbacks for station addition/removalSujith Manoharan2012-11-21
| * mac80211: fix channel context suspend/reconfig handlingJohannes Berg2012-11-20
| * mac80211: make remain_on_channel() op pass vif paramEliad Peller2012-11-19
| * cfg80211: Add TDLS event to allow drivers to request operationsJouni Malinen2012-11-19
| * mac80211: support radiotap vendor namespace RX dataJohannes Berg2012-11-19
| * mac80211: introduce IEEE80211_NUM_TIDS and use itJohannes Berg2012-11-19
| * mac80211: use CMAC_PN_LENJohannes Berg2012-11-19
| * mac80211: check add_chanctx callback before use in ieee80211_reconfigArend van Spriel2012-11-19
| * mac80211: support RX_FLAG_MACTIME_ENDThomas Pedersen2012-11-13
* | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-11-21
|\ \
| * | Bluetooth: Remove OOB data if device was discovered in bandSzymon Janc2012-11-20
| * | Bluetooth: AMP: Set no FCS for incoming L2CAP chanAndrei Emeltchenko2012-11-20
| * | Bluetooth: Improve error message printingAndrei Emeltchenko2012-11-20
| * | Bluetooth: Set local_amp_id after getting Phylink Completed evtAndrei Emeltchenko2012-11-20
| * | Bluetooth: Fix sending L2CAP Create Chan ReqAndrei Emeltchenko2012-11-20
| * | Bluetooth: trivial: Use __constant for constantsAndrei Emeltchenko2012-11-19
| * | Bluetooth: Disable FCS only for new HS channelsAndrei Emeltchenko2012-11-19
| * | Bluetooth: Refactor locking in amp_physical_cfmAndrei Emeltchenko2012-11-19
| * | Bluetooth: Remove unneeded local_amp_id initializationAndrei Emeltchenko2012-11-19
| * | Bluetooth: Use __l2cap_no_conn_pending helperAndrei Emeltchenko2012-11-19
| * | Bluetooth: Fix updating advertising state flags and dataJohan Hedberg2012-11-18
| * | Bluetooth: Add support for setting LE advertising dataJohan Hedberg2012-11-18
| * | Bluetooth: Use proper invalid value for tx_powerJohan Hedberg2012-11-18
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-11-21
|\ \ \
| * | | NFC: Fix nfc_llcp_local chained list insertionThierry Escande2012-11-19
| * | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-11-19
| |\ \ \
| | * | | wireless: add back sysfs directoryJohannes Berg2012-11-16
| | * | | mac80211: deinitialize ibss-internals after emptiness checkSimon Wunderlich2012-11-13