summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-09-266-83/+128
|\
| * Bluetooth: Rename sco_param_wideband table to esco_param_msbcJohan Hedberg2014-09-251-3/+3
| * Bluetooth: Add retransmission effort into SCO parameter tableJohan Hedberg2014-09-241-12/+11
| * ieee802154: 6lowpan: ensure header compression does not corrupt ipv6 headerSimon Vincent2014-09-241-36/+89
| * Bluetooth: Fix reason code used for rejecting SCO connectionsJohan Hedberg2014-09-241-1/+1
| * Bluetooth: Convert bt_<level> logging functions to return voidJoe Perches2014-09-241-10/+4
| * Bluetooth: Check for SCO type before setting retransmission effortBernhard Thaler2014-09-231-5/+17
| * Bluetooth: Fix setting correct security level when initiating SMPJohan Hedberg2014-09-181-1/+4
| * Bluetooth: Remove exported hci_recv_fragment functionMarcel Holtmann2014-09-171-20/+0
| * Bluetooth: Provide HCI command opcode information to driverMarcel Holtmann2014-09-151-0/+1
| * Bluetooth: Add BUILD_BUG_ON check for SKB control buffer sizeMarcel Holtmann2014-09-151-0/+3
* | Merge tag 'nfc-next-3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-09-264-11/+158
|\ \
| * | NFC: nci: Add support for proprietary RF ProtocolsChristophe Ricard2014-09-241-1/+8
| * | NFC: NCI: Fix NCI RF FRAME interface usageVincent Cuissard2014-09-011-2/+5
| * | NFC: NCI: Fix nci_register_device init sequenceVincent Cuissard2014-09-011-8/+5
| * | NFC: NCI: Add support of ISO15693Vincent Cuissard2014-09-012-0/+39
| * | NFC: digital: Add Inititor-side PSL supportMark A. Greer2014-08-311-0/+101
* | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-09-155-55/+75
|\ \ \ | | |/ | |/|
| * | Bluetooth: Fix re-setting RPA as expired when deferring updateJohan Hedberg2014-09-121-0/+1
| * | Bluetooth: Expire RPA if encryption failsJohan Hedberg2014-09-111-0/+6
| * | Bluetooth: Avoid hard-coded IO capability values in SMPJohan Hedberg2014-09-111-2/+2
| * | Bluetooth: Fix L2CAP information request handling for fixed channelsJohan Hedberg2014-09-111-20/+33
| * | Bluetooth: Add smp_ltk_sec_level() helper functionJohan Hedberg2014-09-113-5/+10
| * | Bluetooth: Fix SMP security level when we have no IO capabilitiesJohan Hedberg2014-09-111-2/+10
| * | Bluetooth: Centralize disallowing SMP commands to a single placeJohan Hedberg2014-09-111-16/+1
| * | Bluetooth: Fix ignoring unknown SMP authentication requirement bitsJohan Hedberg2014-09-111-9/+13
| * | Bluetooth: Remove unnecessary early initialization of variableJohan Hedberg2014-09-111-6/+2
| * | Bluetooth: Fix allowing SMP Signing info PDUJohan Hedberg2014-09-101-0/+2
* | | Merge tag 'mac80211-next-for-john-2014-09-12' of git://git.kernel.org/pub/scm...John W. Linville2014-09-1543-357/+945
|\ \ \ | |/ / |/| |
| * | mac80211: replace SMPS hw flags with wiphy feature bitsEliad Peller2014-09-113-8/+3
| * | mac80211: set smps_mode according to ap paramsEliad Peller2014-09-111-2/+13
| * | cfg80211: allow requesting SMPS mode on ap startEliad Peller2014-09-111-0/+24
| * | mac80211: set network header in TDLS framesArik Nemtsov2014-09-111-0/+3
| * | cfg80211/mac80211: add wmm info to assoc eventEliad Peller2014-09-114-11/+33
| * | cfg80211: add WMM traffic stream APIJohannes Berg2014-09-113-0/+185
| * | mac80211: add TDLS connection timeoutLiad Kaufman2014-09-112-1/+23
| * | mac80211: improve minstrel_ht rate sorting by throughput & probabilityThomas Huehn2014-09-113-119/+213
| * | mac80211: Unify rate statistic variables between Minstrel & Minstrel_HTThomas Huehn2014-09-114-97/+85
| * | cfg80211: clear nl80211 messages carrying keys after processingJohannes Berg2014-09-111-4/+21
| * | cfg80211: don't put kek/kck/replay counter on the stackJohannes Berg2014-09-111-7/+3
| * | cfg80211: clear wext keys when freeing and removing themJohannes Berg2014-09-112-1/+3
| * | mac80211: clear key material when freeing keysJohannes Berg2014-09-111-1/+1
| * | cfg80211: clear connect keys when freeing themJohannes Berg2014-09-115-11/+11
| * | mac80211: annotate MMIC head/tailroom warningJohannes Berg2014-09-081-2/+5
| * | mac80211: support DTPC IE (from Cisco Client eXtensions)Steinar H. Gunderson2014-09-083-11/+75
| * | mac80211: split 802.11h parsing from transmit power policySteinar H. Gunderson2014-09-081-19/+41
| * | mac80211: fix broken use of VHT/20Mhz with some APsEyal Shapira2014-09-051-1/+1
| * | mac80211: extend set_coverage_class signatureLorenzo Bianconi2014-09-053-5/+10
| * | cfg80211: enable dynack through nl80211Lorenzo Bianconi2014-09-051-0/+11
| * | mac80211: combine roc with the "next roc" if possibleEliad Peller2014-09-051-24/+53