summaryrefslogtreecommitdiffstats
path: root/net (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'nfc-fixes-3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-12-062-3/+4
|\
| * NFC: Fix incorrect llcp pointer dereferenceWaldemar Rymarkiewicz2012-11-281-1/+4
| * mac80211: fix remain-on-channel (non-)cancellingJohannes Berg2012-11-261-2/+0
* | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-12-036-74/+187
|\ \
| * | Revert "Bluetooth: Fix possible deadlock in SCO code"Gustavo Padovan2012-12-031-9/+10
| * | Bluetooth: trivial: Change NO_FCS_RECV to RECV_NO_FCSAndrei Emeltchenko2012-12-031-5/+5
| * | Bluetooth: Process receiving FCS_NONE in L2CAP Conf RspAndrei Emeltchenko2012-12-031-0/+7
| * | Bluetooth: Fix missing L2CAP EWS Conf parameterAndrei Emeltchenko2012-12-031-17/+15
| * | Bluetooth: AMP: Check that AMP is present and activeAndrei Emeltchenko2012-12-031-0/+1
| * | Bluetooth: AMP: Mark controller radio powered down after HCIDEVDOWNAndrei Emeltchenko2012-12-031-0/+3
| * | Bluetooth: Refactor l2cap_send_disconn_reqAndrei Emeltchenko2012-12-031-30/+26
| * | Bluetooth: Move double negation to macrosGustavo Padovan2012-12-032-7/+7
| * | Bluetooth: Implement deferred sco socket setupFrédéric Dalleau2012-12-032-7/+80
| * | Bluetooth: Add BT_DEFER_SETUP option to sco socketFrédéric Dalleau2012-12-031-0/+32
| * | Bluetooth: cancel power_on work when unregistering the deviceGustavo Padovan2012-12-031-0/+2
| * | Bluetooth: Add missing lock nesting notationGustavo Padovan2012-12-031-2/+2
* | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-11-2637-885/+1237
|\ \ \
| * | | cfg80211: fix some tracing output issuesJohannes Berg2012-11-261-76/+73
| * | | mac80211: support VHT rates in TX infoJohannes Berg2012-11-261-17/+24
| * | | mac80211: support drivers reporting VHT RXJohannes Berg2012-11-264-9/+55
| * | | nl80211/cfg80211: add VHT MCS supportJohannes Berg2012-11-262-16/+116
| * | | mac80211: convert to channel definition structJohannes Berg2012-11-2617-234/+189
| * | | nl80211/cfg80211: support VHT channel configurationJohannes Berg2012-11-2610-94/+382
| * | | cfg80211: pass a channel definition structJohannes Berg2012-11-2613-328/+312
| * | | cfg80211: remove remain-on-channel channel typeJohannes Berg2012-11-2612-126/+63
| * | | mac80211: fix managed mode channel flags handlingJohannes Berg2012-11-261-9/+5
| * | | mac80211: remove mesh config macros from mesh_plink.cMarco Porsch2012-11-261-15/+13
| * | | mac80211: refactor ieee80211_set_qos_hdrMarco Porsch2012-11-261-17/+23
| * | | mac80211: move Mesh Capability field definition to ieee80211.hMarco Porsch2012-11-263-19/+5
| * | | mac80211: in ADHOC print debug message for every Auth messageAntonio Quartulli2012-11-261-2/+4
| * | | mac80211: in ADHOC don't update last_rx if sta is not authorizedAntonio Quartulli2012-11-261-3/+7
| * | | cfg80211: change function signature of cfg80211_get_p2p_attr()Arend van Spriel2012-11-261-2/+3
| * | | cfg80211: use DS or HT operation IEs to determine BSS channelJohannes Berg2012-11-232-9/+45
| * | | mac80211: disable HT advertising unless AP supports itJohannes Berg2012-11-231-0/+1
| * | | mac80211: rename IEEE80211_STA_DISABLE_11N to HTJohannes Berg2012-11-232-9/+9
| * | | mac80211: fix RX chains configurationJohannes Berg2012-11-231-16/+21
| * | | mac80211: fix radiotap vendor area skippingJohannes Berg2012-11-231-4/+7
* | | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-11-2121-138/+378
|\| | |
| * | | mac80211: Add debugfs callbacks for station addition/removalSujith Manoharan2012-11-212-0/+41
| * | | mac80211: fix channel context suspend/reconfig handlingJohannes Berg2012-11-202-3/+56
| * | | mac80211: make remain_on_channel() op pass vif paramEliad Peller2012-11-194-10/+18
| * | | cfg80211: Add TDLS event to allow drivers to request operationsJouni Malinen2012-11-192-0/+70
| * | | mac80211: support radiotap vendor namespace RX dataJohannes Berg2012-11-191-12/+59
| * | | mac80211: introduce IEEE80211_NUM_TIDS and use itJohannes Berg2012-11-1910-44/+41
| * | | mac80211: use CMAC_PN_LENJohannes Berg2012-11-191-2/+3
| * | | mac80211: check add_chanctx callback before use in ieee80211_reconfigArend van Spriel2012-11-191-4/+6
| * | | mac80211: support RX_FLAG_MACTIME_ENDThomas Pedersen2012-11-135-64/+85
* | | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-11-215-27/+177
|\ \ \ \ | | |/ / | |/| |
| * | | Bluetooth: Remove OOB data if device was discovered in bandSzymon Janc2012-11-201-0/+2
| * | | Bluetooth: AMP: Set no FCS for incoming L2CAP chanAndrei Emeltchenko2012-11-201-0/+1