summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* NFC: llcp: Add support in getsockopt for RW, LTO, and MIU remote parametersThierry Escande2013-04-111-1/+22
* NFC: llcp: Reset RW, LTO, and MIU remote parameters when link goes downThierry Escande2013-04-113-2/+13
* NFC: llcp: Use localy stored remote_miu value if not set at socket levelThierry Escande2013-04-113-3/+12
* NFC: llcp: Aggregated frames supportThierry Escande2013-04-112-12/+69
* NFC: llcp: Fix zero octets length SDU handlingOlivier Guiter2013-04-111-8/+8
* NFC: llcp: Fall back to local values when getting socket optionsSamuel Ortiz2013-04-111-3/+13
* NFC: llcp: Socket miux is a big endian fieldSamuel Ortiz2013-04-113-6/+9
* Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-04-1019-373/+406
|\
| * mac80211: make ieee802_11_parse_elems an inlineJohannes Berg2013-04-082-8/+6
| * mac80211: don't start new netdev queues if driver stoppedJohannes Berg2013-04-081-2/+22
| * mac80211: replace some dead code by a warningJohannes Berg2013-04-081-1/+2
| * mac80211: don't fiddle with netdev queues in MLME codeJohannes Berg2013-04-081-24/+2
| * mac80211: disable uAPSD if all ACs are under ACMAlexander Bondar2013-04-081-1/+2
| * mac80211: fix do_stop handling while suspendedJohannes Berg2013-04-081-25/+49
| * mac80211: destroy virtual monitor interface across suspendJohannes Berg2013-04-084-6/+11
| * mac80211: purge remain-on-channel items when suspendingJohannes Berg2013-04-084-5/+8
| * mac80211: remove outdated comment referring to master interfaceJohannes Berg2013-04-081-6/+1
| * mac80211: return new mpath from mesh_path_add()Bob Copeland2013-04-084-51/+42
| * mac80211: fix the PREP mesh hwmp debug messageChun-Yeow Yeoh2013-04-081-2/+2
| * mac80211: parse Timeout Interval Element using a structJohannes Berg2013-04-083-7/+8
| * mac80211: check ERP info IE length in parserJohannes Berg2013-04-084-7/+7
| * mac80211: check DSSS params IE length in parserJohannes Berg2013-04-085-6/+7
| * mac80211: remove unused IE pointers from parserJohannes Berg2013-04-082-28/+0
| * mac80211: remove ancient reference to master interfaceJohannes Berg2013-04-081-1/+1
| * mac80211: be more careful about sending beacon-loss-eventsBen Greear2013-04-081-3/+5
| * mac80211: add beacon stats to debugfsBen Greear2013-04-082-0/+13
| * mac80211: let drivers not supporting channel contexts use VHTKarl Beldan2013-04-081-13/+1
| * mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chanKarl Beldan2013-03-259-71/+83
| * mac80211: allow drivers to set default uAPSD parametersAlexander Bondar2013-03-252-2/+4
| * mac80211: ibss: use beacon_data struct for beacon and probe responseJohannes Berg2013-03-253-71/+70
| * mac80211: ibss: disable beaconing before freeing beaconJohannes Berg2013-03-251-9/+12
| * mac80211: add P2P NoA settingsJanusz Dziedzic2013-03-224-30/+46
| * mac80211: use ieee80211_p2p_noa_attr structureJanusz Dziedzic2013-03-221-11/+15
| * mac80211: make beacon-loss-count configurableBen Greear2013-03-221-3/+7
| * mac80211: return the RSSI in dBmEmmanuel Grumbach2013-03-201-1/+1
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-04-108-24/+44
|\ \
| * \ Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-04-031-0/+2
| |\ \
| | * | cfg80211: sched_scan_mtx lock in cfg80211_conn_work()Artem Savkov2013-03-301-0/+2
| * | | Merge tag 'nfc-fixes-3.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2013-04-012-11/+3
| |\ \ \
| | * | | NFC: llcp: Keep the connected socket parent pointer aliveSamuel Ortiz2013-03-261-1/+3
| | * | | NFC: llcp: Remove possible double call to kfree_skbThierry Escande2013-03-201-2/+0
| | * | | NFC: llcp: Detach socket from process context only when releasing the socketSamuel Ortiz2013-03-202-8/+0
| * | | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-04-015-13/+39
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | mac80211: fix idle handling sequenceJohannes Berg2013-03-253-4/+16
| | * | | mac80211: fix remain-on-channel cancel crashJohannes Berg2013-03-253-9/+23
* | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-03-2912-74/+145
|\| | | |
| * | | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-03-2512-76/+154
| |\| | | | | |/ / | |/| |
| | * | mac80211: Don't restart sta-timer if not associated.Ben Greear2013-03-242-3/+6
| | * | cfg80211: always check for scan end on P2P deviceJohannes Berg2013-03-246-47/+92
| | * | mac80211: fix virtual monitor interface lockingJohannes Berg2013-03-201-16/+19