summaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-12-063-21/+84
|\
| * mac80211: Fix typo in mac80211.hSimon Wunderlich2012-12-031-1/+1
| * cfg80211: fix BSS struct IE access racesJohannes Berg2012-11-301-14/+27
| * mac80211: remove probe response temporary buffer allocationJohannes Berg2012-11-301-3/+2Star
| * nl80211: support P2P GO powersave configurationJohannes Berg2012-11-271-0/+7
| * mac80211: support (partial) VHT radiotap informationJohannes Berg2012-11-272-0/+29
| * cfg80211: rework chandef checking and export itJohannes Berg2012-11-271-3/+18
* | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-12-032-7/+26
|\ \
| * | Bluetooth: trivial: Change NO_FCS_RECV to RECV_NO_FCSAndrei Emeltchenko2012-12-031-1/+1
| * | Bluetooth: AMP: Check that AMP is present and activeAndrei Emeltchenko2012-12-031-0/+16
| * | Bluetooth: Move double negation to macrosGustavo Padovan2012-12-031-3/+3
| * | Bluetooth: Implement deferred sco socket setupFrédéric Dalleau2012-12-031-3/+6
* | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-11-262-63/+173
|\ \ \ | | |/ | |/|
| * | mac80211: support VHT rates in TX infoJohannes Berg2012-11-261-3/+33
| * | mac80211: support drivers reporting VHT RXJohannes Berg2012-11-261-1/+11
| * | nl80211/cfg80211: add VHT MCS supportJohannes Berg2012-11-261-7/+17
| * | mac80211: convert to channel definition structJohannes Berg2012-11-261-10/+7Star
| * | nl80211/cfg80211: support VHT channel configurationJohannes Berg2012-11-261-4/+69
| * | cfg80211: pass a channel definition structJohannes Berg2012-11-261-30/+35
| * | cfg80211: remove remain-on-channel channel typeJohannes Berg2012-11-262-10/+2Star
| * | cfg80211: change function signature of cfg80211_get_p2p_attr()Arend van Spriel2012-11-261-2/+3
* | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-11-212-2/+56
|\| |
| * | mac80211: Add debugfs callbacks for station addition/removalSujith Manoharan2012-11-211-0/+18
| * | mac80211: make remain_on_channel() op pass vif paramEliad Peller2012-11-191-0/+1
| * | cfg80211: Add TDLS event to allow drivers to request operationsJouni Malinen2012-11-191-0/+19
| * | mac80211: support radiotap vendor namespace RX dataJohannes Berg2012-11-191-0/+12
| * | mac80211: support RX_FLAG_MACTIME_ENDThomas Pedersen2012-11-131-2/+6
* | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-11-213-2/+26
|\ \ \ | | |/ | |/|
| * | Bluetooth: Increase HCI command tx timeoutSzymon Janc2012-11-191-1/+1
| * | Bluetooth: Refactor locking in amp_physical_cfmAndrei Emeltchenko2012-11-191-1/+1
| * | Bluetooth: Fix updating advertising state flags and dataJohan Hedberg2012-11-191-0/+2
| * | Bluetooth: Add support for setting LE advertising dataJohan Hedberg2012-11-192-0/+19
| * | Bluetooth: Use proper invalid value for tx_powerJohan Hedberg2012-11-191-0/+3
* | | NFC: Export nfc_hci_sak_to_protocol()Eric Lapuyade2012-11-191-0/+1
* | | NFC: Export nfc_hci_result_to_errno as it can be needed by HCI driversEric Lapuyade2012-11-191-0/+2
|/ /
* | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-11-162-8/+83
|\|
| * mac80211: clarify interface iteration and make it configurableJohannes Berg2012-11-091-2/+21
| * mac80211: call driver method when restart completesJohannes Berg2012-11-091-0/+6
| * mac80211: pass P2P powersave parameters to driverJohannes Berg2012-11-061-0/+7
| * wireless: add utility function to get P2P attributeJohannes Berg2012-11-061-0/+19
| * cfg80211: allow registering more than one beacon listenerBen Greear2012-11-051-2/+1Star
| * nl/cfg80211: add the NL80211_CMD_SET_MCAST_RATE commandAntonio Quartulli2012-11-051-0/+6
| * mac80211: handle TX power per virtual interfaceJohannes Berg2012-10-301-1/+6
| * cfg80211: allow per interface TX power settingJohannes Berg2012-10-301-3/+7
| * Merge remote-tracking branch 'wireless-next/master' into mac80211-nextJohannes Berg2012-10-309-13/+194
| |\
| * | mac80211: add explicit AP/GO driver operationsJohannes Berg2012-10-261-0/+10
* | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-11-144-19/+74
|\ \ \ | |_|/ |/| |
| * | Bluetooth: Fix parameter order of hci_get_routeJohan Hedberg2012-11-011-1/+1
| * | Bluetooth: Rename ctrl_id to remote_amp_idAndrei Emeltchenko2012-11-011-2/+1Star
| * | Bluetooth: AMP: Use l2cap_physical_cfm in phylink complete evtAndrei Emeltchenko2012-11-012-0/+2