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-07-2211-122/+144
|\
| * Bluetooth: Prefer sizeof(*ptr) when allocating memoryJohan Hedberg2014-07-213-6/+6
| * Bluetooth: Remove unneeded variable assignment in hmac_sha256Marcel Holtmann2014-07-201-1/+1
| * Bluetooth: Disable HCI_CONNECTABLE based passive scanning for nowJohan Hedberg2014-07-201-2/+1
| * Bluetooth: Use EOPNOTSUPP instead of ENOTSUPPJohan Hedberg2014-07-184-5/+5
| * Bluetooth: Fix allowing initiating pairing when not pairableJohan Hedberg2014-07-171-2/+7
| * Bluetooth: Introduce a flag to track who really initiates authenticationJohan Hedberg2014-07-172-0/+8
| * Bluetooth: Pass initiator/acceptor information to hci_conn_security()Johan Hedberg2014-07-175-11/+14
| * Bluetooth: Fix resetting remote authentication requirement after pairingJohan Hedberg2014-07-171-0/+3
| * Bluetooth: never linger on process exitVladimir Davydov2014-07-173-4/+8
| * Bluetooth: Don't bother user space without IO capabilitiesJohan Hedberg2014-07-172-1/+7
| * Bluetooth: Fix using uninitialized variable when pairingJohan Hedberg2014-07-171-1/+1
| * Bluetooth: Fix always checking the blacklist for incoming connectionsJohan Hedberg2014-07-161-12/+11
| * Bluetooth: Fix trying to initiate connections when acting as LE slaveJohan Hedberg2014-07-161-0/+6
| * Bluetooth: Add a role parameter to hci_conn_add()Johan Hedberg2014-07-163-21/+17
| * Bluetooth: Use explicit role instead of a bool in function parametersJohan Hedberg2014-07-166-21/+27
| * Bluetooth: Convert HCI_CONN_MASTER flag to a conn->role variableJohan Hedberg2014-07-164-33/+23
| * Bluetooth: Add proper defines for HCI connection roleJohan Hedberg2014-07-161-1/+1
| * Bluetooth: Don't try to reject failed LE connectionsJohan Hedberg2014-07-151-5/+5
| * Bluetooth: Remove unnecessary params variable from process_adv_report()Johan Hedberg2014-07-151-5/+2
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-nextJohn W. Linville2014-07-2217-169/+653
|\ \
| * | mac80211: add support for Rx reordering offloadingMichal Kazior2014-07-213-23/+118
| * | mac80211: fix Rx reordering with RX_FLAG_AMSDU_MOREMichal Kazior2014-07-214-24/+62
| * | mac80211: remove useless NULL checksEytan Lifshitz2014-07-211-3/+0
| * | mac80211: fix a potential NULL access in ieee80211_crypto_hw_decryptMax Stepanov2014-07-211-1/+1
| * | wireless: fixup genregdb.awk for remove of antenna gain from wireless-regdLuis R. Rodriguez2014-07-212-13/+28
| * | mac80211: remove redundant IEEE80211_STA_CSA_RECEIVED flagLuciano Coelho2014-07-212-8/+1
| * | mac80211: make sure TDLS teardown packet is sent on timeLiad Kaufman2014-07-211-0/+11
| * | mac80211: ignore frames between TDLS peers when operating as APArik Nemtsov2014-07-211-0/+8
| * | cfg80211: fix TDLS setup with VHT peersArik Nemtsov2014-07-211-1/+2
| * | mac80211: disable VHT for TDLSArik Nemtsov2014-07-211-0/+4
| * | mac80211: set Rx highest rate in ht_capArik Nemtsov2014-07-211-0/+3
| * | mac80211: support HT for TDLS stationsArik Nemtsov2014-07-212-8/+87
| * | mac80211: move TDLS data to mgd private partArik Nemtsov2014-07-214-19/+20
| * | mac80211: add TDLS QoS param IE on setup-confirmArik Nemtsov2014-07-211-0/+124
| * | mac80211: add QoS IE during TDLS setup startArik Nemtsov2014-07-215-21/+26
| * | mac80211: set TDLS capab to zero on failure framesArik Nemtsov2014-07-211-4/+12
| * | mac80211: avoid adding some IEs on TDLS setup failure packetsArik Nemtsov2014-07-211-26/+32
| * | mac80211: split extra TDLS IEs in setup framesArik Nemtsov2014-07-211-7/+70
| * | mac80211: consolidate TDLS IE treatmentArik Nemtsov2014-07-211-28/+41
| * | mac80211: fix error path for TDLS setupArik Nemtsov2014-07-211-6/+10
| * | mac80211: track TDLS initiator internallyArik Nemtsov2014-07-212-11/+27
| * | mac80211: suppress unused variable warning without lockdepJohannes Berg2014-07-181-1/+1
* | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-07-1816-243/+276
|\ \ \ | | |/ | |/|
| * | Bluetooth: cmtp: Remove unnecessary null testHimangi Saraogi2014-07-141-6/+0
| * | Bluetooth: Fix trying LTK re-encryption when we don't have an LTKJohan Hedberg2014-07-141-2/+5
| * | Bluetooth: Remove sco_chan_get helper functionMarcel Holtmann2014-07-141-11/+9
| * | Bluetooth: Convert L2CAP ident spinlock into a mutexMarcel Holtmann2014-07-131-3/+3
| * | Bluetooth: Remove unneeded forward declaration of sco_chan_delMarcel Holtmann2014-07-131-29/+27
| * | Bluetooth: Remove unneeded forward declaration of __sco_chan_addMarcel Holtmann2014-07-131-12/+11
OpenPOWER on IntegriCloud