summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2013-12-094-79/+70
|\
| * Bluetooth: Remove dead code from SMP encryption functionJohan Hedberg2013-12-041-8/+1
| * Bluetooth: Remove useless smp_rand functionJohan Hedberg2013-12-041-13/+2
| * Bluetooth: Refactor hci_disconn_complete_evtAndre Guedes2013-12-041-22/+21
| * Bluetooth: Remove unneeded check in hci_disconn_complete_evt()Andre Guedes2013-12-041-10/+9
| * Bluetooth: Remove unnecessary 'send' parameter from smp_failure()Johan Hedberg2013-12-041-8/+8
| * Bluetooth: Remove link type check in hci_disconn_complete_evt()Andre Guedes2013-12-041-2/+1
| * Bluetooth: Add an extra check in mgmt_device_disconnected()Andre Guedes2013-12-041-0/+3
| * Bluetooth: Check address in mgmt_disconnect_failed()Andre Guedes2013-12-041-1/+11
| * Bluetooth: Store supported commands only during setup procedureMarcel Holtmann2013-12-041-1/+4
| * Bluetooth: Remove debug statement for features complete eventMarcel Holtmann2013-12-041-6/+0
| * Bluetooth: Set default own address type only during controller setupMarcel Holtmann2013-12-041-9/+11
| * Bluetooth: Fix limited discoverable mode for Zeevo modulesMarcel Holtmann2013-12-041-1/+1
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-12-0615-59/+99
|\ \ | |/ |/|
| * Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-12-022-0/+10
| |\
| | * mac80211: check csa wiphy flag in ibss before switchingSimon Wunderlich2013-12-021-0/+4
| | * cfg80211: disable CSA for all driversSimon Wunderlich2013-12-021-0/+6
| * | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-11-2514-59/+89
| |\|
| | * mac80211: set hw initial idle stateKarl Beldan2013-11-251-0/+2
| | * mac80211: use capped prob when computing throughputsKarl Beldan2013-11-251-1/+1
| | * cfg80211: ignore supported rates for nonexistant bands on scanFelix Fietkau2013-11-251-0/+4
| | * mac80211: fix connection pollingEliad Peller2013-11-251-0/+2
| | * mac80211: fix the mesh channel switch supportChun-Yeow Yeoh2013-11-255-14/+24
| | * mac80211: don't attempt to reorder multicast framesJohannes Berg2013-11-251-1/+2
| | * cfg80211: disable 5/10 MHz support for all driversJohannes Berg2013-11-251-0/+3
| | * mac80211: minstrel_ht: fix rates selectionKarl Beldan2013-11-251-2/+3
| | * mac80211: fix for mesh beacon update on powersaveJavier Lopez2013-11-251-1/+1
| | * mac80211: fix crash when using AP VLAN interfacesFelix Fietkau2013-11-251-1/+0
| | * nl80211: check nla_nest_start() return valueJohannes Berg2013-11-251-0/+2
| | * nl80211: fix error path in nl80211_get_key()Johannes Berg2013-11-251-1/+1
| | * nl80211: check nla_put_* return valuesJohannes Berg2013-11-251-22/+30
| | * mac80211: fix scheduled scan rtnl deadlockJohannes Berg2013-11-252-1/+2
| | * mac80211: DFS setup chandef for radar_event correctlyJanusz Dziedzic2013-11-251-4/+2
| | * cfg80211: fix ibss wext chandef creationSimon Wunderlich2013-11-251-9/+9
| | * Revert "mac80211: allow disable power save in mesh"Bob Copeland2013-11-251-2/+1
* | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-12-0246-1092/+2460
|\ \ \ | |/ / |/| |
| * | mac80211: fix rx_nss calculation for drivers with hw rcMichal Kazior2013-12-021-2/+2
| * | mac80211: don't leak next beacon when csa is abortedSimon Wunderlich2013-12-021-0/+3
| * | mac80211: don't cancel csa finalize work within stop_apSimon Wunderlich2013-12-021-1/+0
| * | cfg80211/mac80211/ath6kl: acquire wdev lock outside ch_switch_notifySimon Wunderlich2013-12-022-12/+18
| * | mac80211: modify beacon using sdata/wdev-lock, not rtnl lockSimon Wunderlich2013-12-022-8/+15
| * | cfg80211: protect beacon changing functions with wdev-lockSimon Wunderlich2013-12-021-3/+19
| * | mac80211: mesh: only get tsf if we need itBob Copeland2013-12-021-14/+14
| * | cfg80211: aggregate mgmt_tx parameters into a structAndrei Otcheretianski2013-12-026-57/+48
| * | mac80211: update ht flag if bss configuration changedAvri Altman2013-12-021-8/+10
| * | mac80211: remove sta_info_flush() from interface teardownJohannes Berg2013-12-021-4/+0
| * | mac80211: Tx frame latency statisticsMatti Gottlieb2013-12-028-0/+486
| * | cfg80211: fix reporting 5/10 MHz support to user spaceFelix Fietkau2013-12-021-4/+5
| * | mac80211: minstrel_ht: do not sample unsupported ratesKarl Beldan2013-11-251-3/+7
| * | cfg80211: replace print_dfs_region() with reg_dfs_region_str() helperLuis R. Rodriguez2013-11-251-25/+16