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. Linville2013-04-22
|\
| * mac80211/minstrel: use the new rate control APIFelix Fietkau2013-04-22
| * mac80211/minstrel_ht: use the new rate control APIFelix Fietkau2013-04-22
| * mac80211: improve the rate control APIFelix Fietkau2013-04-22
| * cfg80211: introduce critical protocol indication from user-spaceArend van Spriel2013-04-22
| * mac80211: minstrel_ht: initialize rates selectionKarl Beldan2013-04-22
| * mac80211: minstrel_ht: pick only supported rates for sta and group max*ratesKarl Beldan2013-04-22
| * rfkill: fix error return code in rfkill_gpio_probe()Wei Yongjun2013-04-22
| * mac80211: use synchronize_rcu() with rcu_barrier()Bob Copeland2013-04-22
| * mac80211: indicate admission control in TX queue parametersAlexander Bondar2013-04-22
| * cfg80211: invert P2P-Device vs. netdev check orderingJohannes Berg2013-04-22
| * cfg80211: fix P2P-Device stop lockingJohannes Berg2013-04-22
| * Merge remote-tracking branch 'wireless-next/master' into mac80211-nextJohannes Berg2013-04-22
| |\
| * | nl80211: allow using wdev identifiers to get scan resultsJohannes Berg2013-04-18
| * | mac80211: fix P2P-Device management frame RXJohannes Berg2013-04-18
| * | mac80211: optimize minstrel_ewmaKarl Beldan2013-04-17
| * | mac80211: cosmetics for minstrel_debugfsKarl Beldan2013-04-17
| * | mac80211: fix station entry leak/warning while suspendingJohannes Berg2013-04-17
| * | mac80211: fix CTS protection handlingFelix Fietkau2013-04-16
| * | mac80211: fix and optimize MCS mask handlingFelix Fietkau2013-04-16
| * | mac80211: adjust initial chandefs assignments in ieee80211_register_hwKarl Beldan2013-04-16
| * | mac80211: fix rate control tx handler for VHT ratesKarl Beldan2013-04-16
| * | mac80211: remove warning from ieee80211_beacon_lossAlexander Bondar2013-04-16
| * | mac80211: handle wide bandwidth channel switchJohannes Berg2013-04-16
| * | mac80211: parse VHT channel switch IEsJohannes Berg2013-04-16
| * | mac80211: handle extended channel switch announcementJohannes Berg2013-04-16
| * | mac80211: support secondary channel offset in CSAJohannes Berg2013-04-16
| * | mac80211: support extended channel switchJohannes Berg2013-04-16
| * | cfg80211: add ieee80211_operating_class_to_bandJohannes Berg2013-04-16
| * | mac80211: unify CSA action frame/beacon processingJohannes Berg2013-04-16
| * | mac80211: use second center_freq segment only in 80+80Johannes Berg2013-04-16
| * | wireless: regulatory: fix channel disabling race conditionJohannes Berg2013-04-16
| * | mac80211: always pick a basic rate to tx RTS/CTS for pre-HT ratesKarl Beldan2013-04-11
| * | mac80211: fix ieee80211_queue_stopped()Thomas Pedersen2013-04-11
| * | mac80211: provide SSID in IBSS modeMarek Puzyniak2013-04-10
| * | mac80211: always advertise STBC/MCSes even if no AP supportJohannes Berg2013-04-10
| * | mac80211: clear SSID when stopping APMarek Puzyniak2013-04-10
| * | mac80211: fix recalc_radar hwconf sync problemSimon Wunderlich2013-04-10
| * | mac80211: stringify another plink stateThomas Pedersen2013-04-10
| * | mac80211: unset FC retry bit in mesh fwding pathThomas Pedersen2013-04-10
* | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2013-04-22
|\ \ \
| * | | Bluetooth: Rename LE_SCANNING_* macrosAndre Guedes2013-04-18
| * | | Bluetooth: Add macros for filter duplicates valuesAndre Guedes2013-04-18
| * | | Bluetooth: Add LE scan type macrosAndre Guedes2013-04-18
| * | | Bluetooth: Change LE scanning timeout macrosAndre Guedes2013-04-18
| * | | Bluetooth: Add reading of all local feature pagesJohan Hedberg2013-04-17
| * | | Bluetooth: Track feature pages in a single tableJohan Hedberg2013-04-17
| * | | Bluetooth: Move and rename hci_conn_acceptFrédéric Dalleau2013-04-17
| * | | Bluetooth: Fix incorrect SSP mode bit for non SSP devicesJaganath Kanakkassery2013-04-17
| * | | Bluetooth: hidp: fix sending output reports on intr channelDavid Herrmann2013-04-17