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. 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
| * | Bluetooth: Improve error message printingAndrei Emeltchenko2012-11-201-1/+1
| * | Bluetooth: Set local_amp_id after getting Phylink Completed evtAndrei Emeltchenko2012-11-201-0/+1
| * | Bluetooth: Fix sending L2CAP Create Chan ReqAndrei Emeltchenko2012-11-201-11/+18
| * | Bluetooth: trivial: Use __constant for constantsAndrei Emeltchenko2012-11-191-4/+4
| * | Bluetooth: Disable FCS only for new HS channelsAndrei Emeltchenko2012-11-192-1/+2
| * | Bluetooth: Refactor locking in amp_physical_cfmAndrei Emeltchenko2012-11-192-6/+7
| * | Bluetooth: Remove unneeded local_amp_id initializationAndrei Emeltchenko2012-11-191-1/+0
| * | Bluetooth: Use __l2cap_no_conn_pending helperAndrei Emeltchenko2012-11-191-1/+1
| * | Bluetooth: Fix updating advertising state flags and dataJohan Hedberg2012-11-181-0/+31
| * | Bluetooth: Add support for setting LE advertising dataJohan Hedberg2012-11-182-1/+104
| * | Bluetooth: Use proper invalid value for tx_powerJohan Hedberg2012-11-183-1/+5
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-11-2115-25/+72
|\ \ \
| * | | NFC: Fix nfc_llcp_local chained list insertionThierry Escande2012-11-201-1/+1
| * | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-11-192-4/+24
| |\ \ \
| | * | | wireless: add back sysfs directoryJohannes Berg2012-11-161-0/+20
| | * | | mac80211: deinitialize ibss-internals after emptiness checkSimon Wunderlich2012-11-131-4/+4
| * | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/blueto...John W. Linville2012-11-143-8/+10
| |\ \ \ \
| | * | | | Bluetooth: Fix memory leak when removing a UUIDJohan Hedberg2012-11-091-0/+1
| | * | | | Bluetooth: Notify about device registration before power onMarcel Holtmann2012-11-091-2/+2
| | * | | | Bluetooth: Fix error status when pairing failsPaulo Sérgio2012-11-091-1/+1
| | * | | | Bluetooth: Fix having bogus entries in mgmt_read_index_list replyJohan Hedberg2012-11-091-5/+6
| * | | | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-11-149-12/+37
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | wireless: allow 40 MHz on world roaming channels 12/13Johannes Berg2012-11-121-3/+2
| | * | | mac80211: call skb_dequeue/ieee80211_free_txskb instead of __skb_queue_purgeFelix Fietkau2012-11-104-6/+20
| | * | | mac80211: don't send null data packet when not associatedJohannes Berg2012-11-091-0/+2
| | * | | mac80211: fix memory leak in device registration error pathJohannes Berg2012-11-091-2/+4
| | * | | mac80211: sync acccess to tx_filtered/ps_tx_buf queuesArik Nemtsov2012-11-051-0/+5
| | * | | mac80211: init sched_scan_iesDavid Spinadel2012-10-311-1/+1
| | * | | mac80211: do not call ieee80211_configure_filter if no interfaces are upFelix Fietkau2012-10-311-0/+3
* | | | | NFC: Queue a copy of the transmitted LLCP skbSamuel Ortiz2012-11-191-4/+13
* | | | | NFC: Stop sending LLCP frames when tx queues are getting too deepSamuel Ortiz2012-11-191-0/+17
* | | | | NFC: Copy user space buffer when sending UI framesSamuel Ortiz2012-11-191-2/+13
* | | | | NFC: Export nfc_hci_sak_to_protocol()Eric Lapuyade2012-11-191-1/+2
* | | | | NFC: Export nfc_hci_result_to_errno as it can be needed by HCI driversEric Lapuyade2012-11-191-1/+2
* | | | | NFC: Dot not dispatch HCI event received on unopened pipeEric Lapuyade2012-11-191-5/+8
* | | | | NFC: Ignore err when chip doesn't implement HW/SW info registersEric Lapuyade2012-11-191-0/+6
* | | | | NFC: Fix hci_connect_gate() when a pre-opened pipe is passedEric Lapuyade2012-11-191-2/+2
| |_|/ / |/| | |