summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-10-1026-542/+1237
|\
| * mac80211: implement STA CSA for drivers using channel contextsArik Nemtsov2013-10-023-19/+48
| * cfg80211: vlan priority handling in WMMcedric Voncken2013-10-021-0/+9
| * regulatory: enable channels 52-64 and 100-144 for world roamingJohannes Berg2013-10-011-2/+12
| * nl80211: allow CAC only if no operation is going onSimon Wunderlich2013-10-011-0/+3
| * mac80211: improve default WMM parameter settingFred Zhou2013-10-011-13/+14
| * mac80211: support reporting A-MSDU subframes individuallyMichal Kazior2013-10-011-1/+2
| * mac80211: use exact-size allocation for authentication frameFred Zhou2013-10-011-2/+2
| * cfg80211: parse dfs region for internal regdb optionJanusz Dziedzic2013-10-011-0/+6
| * mac80211: add explicit IBSS driver operationsJohannes Berg2013-10-013-2/+82
| * ieee80211: fix vht cap definitionsEliad Peller2013-10-011-2/+2
| * mac80211: fix some snprintf misusesEliad Peller2013-10-013-50/+55
| * nl80211: enable IBSS support for channel switch announcementsSimon Wunderlich2013-09-261-15/+34
| * mac80211: send a CSA action frame when changing channelSimon Wunderlich2013-09-261-0/+60
| * mac80211: add support for CSA in IBSS modeSimon Wunderlich2013-09-266-43/+480
| * mac80211: split off ibss disconnectSimon Wunderlich2013-09-261-80/+92
| * mac80211: split off channel switch parsing functionSimon Wunderlich2013-09-264-223/+262
| * cfg80211: export cfg80211_chandef_dfs_requiredSimon Wunderlich2013-09-262-9/+1Star
| * mac80211: do not override fixed_rate_idx in minstrel_ht_update_statsLorenzo Bianconi2013-09-261-10/+13
| * mac80211: add fixed_rate management to minstrel rcLorenzo Bianconi2013-09-261-0/+14
| * mac80211: change beacon/connection pollingStanislaw Gruszka2013-09-263-32/+10Star
| * mac80211: Remove superfluous is_multicast_ether_addr() callSergey Ryazanov2013-09-261-1/+1
| * mac80211: use ERR_CAST()Johannes Berg2013-09-261-1/+1
| * mac80211: add ieee80211_iterate_active_interfaces_rtnl()Johannes Berg2013-09-261-37/+34Star
* | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2013-10-0312-326/+969
|\ \
| * | Bluetooth: Only one command per L2CAP LE signalling is supportedMarcel Holtmann2013-10-031-25/+19Star
| * | Bluetooth: Check minimum length of SMP packetsMarcel Holtmann2013-10-031-2/+7
| * | Bluetooth: Drop packets on ATT fixed channel on BR/EDRMarcel Holtmann2013-10-031-0/+4
| * | Bluetooth: L2CAP connectionless channels are only valid for BR/EDRMarcel Holtmann2013-10-031-0/+4
| * | Bluetooth: SMP packets are only valid on LE connectionsMarcel Holtmann2013-10-031-0/+6
| * | Bluetooth: Don't copy L2CAP LE signalling to raw socketsMarcel Holtmann2013-10-031-2/+0Star
| * | Bluetooth: Fix switch statement order for L2CAP fixed channelsMarcel Holtmann2013-10-031-3/+4
| * | Bluetooth: Allow changing device class when BR/EDR is disabledMarcel Holtmann2013-10-031-1/+1
| * | Bluetooth: Restrict loading of long term keys to LE capable controllersMarcel Holtmann2013-10-031-0/+6
| * | Bluetooth: Restrict loading of link keys to BR/EDR capable controllersMarcel Holtmann2013-10-031-0/+6
| * | Bluetooth: Allow setting static address even if LE is disabledMarcel Holtmann2013-10-031-4/+2Star
| * | Bluetooth: Restrict SSP setting changes to BR/EDR enabled controllersMarcel Holtmann2013-10-031-1/+5
| * | Bluetooth: Fix memory leak with L2CAP signal channelsMarcel Holtmann2013-10-021-2/+4
| * | Bluetooth: Increment management interface revisionMarcel Holtmann2013-10-021-1/+1
| * | Bluetooth: Fix advertising data flags with disabled BR/EDRJohan Hedberg2013-10-021-7/+7
| * | Bluetooth: Fix REJECTED vs NOT_SUPPORTED mgmt responsesJohan Hedberg2013-10-021-25/+51
| * | Bluetooth: Add management command for setting static addressMarcel Holtmann2013-10-021-0/+49
| * | Bluetooth: Restrict disabling of HS when controller is powered offMarcel Holtmann2013-10-021-2/+9
| * | Bluetooth: Add a new mgmt_set_bredr commandJohan Hedberg2013-10-022-0/+125
| * | Bluetooth: Introduce a new HCI_BREDR_ENABLED flagJohan Hedberg2013-10-023-13/+35
| * | Bluetooth: Fix workqueue synchronization in hci_dev_openJohan Hedberg2013-10-021-0/+10
| * | Bluetooth: Refactor hci_dev_open to a separate hci_dev_do_open functionJohan Hedberg2013-10-021-10/+20
| * | Bluetooth: Enable -D__CHECK_ENDIAN__ for sparse by defaultMarcel Holtmann2013-10-021-0/+2
| * | Bluetooth: Require CAP_NET_ADMIN for HCI User Channel operationMarcel Holtmann2013-10-021-1/+1
| * | Bluetooth: Send new settings event when changing high speed optionMarcel Holtmann2013-10-021-3/+16