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. Linville2013-04-222-10/+114
|\
| * mac80211: improve the rate control APIFelix Fietkau2013-04-221-0/+66
| * cfg80211: introduce critical protocol indication from user-spaceArend van Spriel2013-04-221-0/+23
| * mac80211: indicate admission control in TX queue parametersAlexander Bondar2013-04-221-0/+2
| * Merge remote-tracking branch 'wireless-next/master' into mac80211-nextJohannes Berg2013-04-225-14/+57
| |\
| * | mac80211: fix CTS protection handlingFelix Fietkau2013-04-161-1/+3
| * | mac80211: fix and optimize MCS mask handlingFelix Fietkau2013-04-161-2/+2
| * | mac80211: VHT off-by-one NSSKarl Beldan2013-04-161-3/+3
| * | mac80211: support secondary channel offset in CSAJohannes Berg2013-04-161-2/+2
| * | cfg80211: add ieee80211_operating_class_to_bandJohannes Berg2013-04-161-0/+11
| * | mac80211: provide SSID in IBSS modeMarek Puzyniak2013-04-101-2/+2
* | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2013-04-224-36/+91
|\ \ \
| * | | Bluetooth: Rename LE_SCANNING_* macrosAndre Guedes2013-04-181-2/+2
| * | | Bluetooth: Add macros for filter duplicates valuesAndre Guedes2013-04-181-0/+2
| * | | Bluetooth: Add LE scan type macrosAndre Guedes2013-04-181-0/+3
| * | | Bluetooth: Add reading of all local feature pagesJohan Hedberg2013-04-181-1/+2
| * | | Bluetooth: Track feature pages in a single tableJohan Hedberg2013-04-181-24/+25
| * | | Bluetooth: Move and rename hci_conn_acceptFrédéric Dalleau2013-04-181-1/+0
| * | | Bluetooth: l2cap: add l2cap_user sub-modulesDavid Herrmann2013-04-171-0/+10
| * | | Bluetooth: l2cap: introduce l2cap_conn ref-countingDavid Herrmann2013-04-171-0/+4
| * | | Bluetooth: allow constant arguments for bacmp()/bacpy()David Herrmann2013-04-171-2/+2
| * | | Bluetooth: introduce hci_conn ref-countingDavid Herrmann2013-04-171-0/+31
| * | | Bluetooth: remove unneeded hci_conn_hold/put_device()David Herrmann2013-04-171-4/+0
| * | | Bluetooth: rename hci_conn_put to hci_conn_dropDavid Herrmann2013-04-111-1/+1
| * | | Bluetooth: hidp: verify l2cap socketsDavid Herrmann2013-04-051-0/+1
| * | | Bluetooth: Remove driver init queue from coreMarcel Holtmann2013-04-041-2/+0
| * | | Bluetooth: Add driver setup stage for early initMarcel Holtmann2013-04-041-0/+1
| * | | Bluetooth: Add __hci_cmd_sync_ev functionJohan Hedberg2013-04-041-0/+2
| * | | Bluetooth: Add support for custom event terminated commandsJohan Hedberg2013-04-042-0/+3
| * | | Bluetooth: Add __hci_cmd_sync() helper functionJohan Hedberg2013-04-041-0/+3
| * | | Bluetooth: Track received events in hdevJohan Hedberg2013-04-041-0/+1
| * | | Bluetooth: Remove unneeded hci_req_cmd_status functionAndre Guedes2013-04-041-1/+0
* | | | NFC: RFKILL supportSamuel Ortiz2013-04-121-0/+2
| |_|/ |/| |
* | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-04-102-13/+28
|\ \ \ | |/ / |/| / | |/
| * mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chanKarl Beldan2013-03-251-9/+9
| * mac80211: allow drivers to set default uAPSD parametersAlexander Bondar2013-03-251-0/+13
| * cfg80211: Document update_ft_ies() cfg80211_opsJouni Malinen2013-03-251-0/+4
| * mac80211: add P2P NoA settingsJanusz Dziedzic2013-03-221-4/+2
* | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2013-03-254-14/+53
|\ \
| * | Bluetooth: Add reading of page scan parametersJohan Hedberg2013-03-182-0/+17
| * | Bluetooth: Add proper flag for fast connectable modeJohan Hedberg2013-03-181-1/+3
| * | Bluetooth: Handle AD updating through an async requestJohan Hedberg2013-03-181-2/+2
| * | Bluetooth: Add a define for the HCI persistent flags maskJohan Hedberg2013-03-181-0/+5
| * | Bluetooth: Remove useless HCI_PENDING_CLASS flagJohan Hedberg2013-03-181-1/+0
| * | Bluetooth: Make hci_req_add returning voidAndre Guedes2013-03-091-1/+1
| * | Bluetooth: HCI request error handlingAndre Guedes2013-03-091-0/+5
| * | Bluetooth: Remove unused hdev->init_last_cmdJohan Hedberg2013-03-081-2/+0
| * | Bluetooth: Use async requests internally in hci_req_syncJohan Hedberg2013-03-081-2/+0
| * | Bluetooth: Add request cmd_complete and cmd_status functionsJohan Hedberg2013-03-081-0/+2
| * | Bluetooth: Introduce new hci_req_add functionJohan Hedberg2013-03-081-0/+1
OpenPOWER on IntegriCloud