summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Bluetooth: Fix not closing SCO sockets in the BT_CONNECT2 stateVinicius Costa Gomes2013-03-141-0/+1
* Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-02-112-5/+9
|\
| * mac80211: fix channel selection bugJohannes Berg2013-02-111-3/+3
| * mac80211: fix managed mode channel context useJohannes Berg2013-02-071-1/+4
| * mac80211: fix error in sizeof() usageCong Ding2013-02-061-1/+2
* | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2013-02-042-3/+16
|\ \
| * | Bluetooth: Fix hci_conn timeout routineAndre Guedes2013-01-311-3/+3
| * | Bluetooth: Fix handling of unexpected SMP PDUsJohan Hedberg2013-01-311-0/+13
* | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-01-281-1/+1
|\ \ \ | | |/ | |/|
| * | cfg80211: off by one in ieee80211_bss()Dan Carpenter2013-01-241-1/+1
* | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-01-226-31/+35
|\| | | |/ |/|
| * mac80211: add encrypt headroom to PERR framesBob Copeland2013-01-161-1/+3
| * mac80211: set NEED_TXPROCESSING for PERR framesBob Copeland2013-01-161-0/+1
| * mac80211: fix monitor mode injectionFelix Fietkau2013-01-161-3/+6
| * mac80211: synchronize scan off/on-channel and PS statesStanislaw Gruszka2013-01-163-26/+14Star
| * mac80211: fix FT roamingJohannes Berg2013-01-161-1/+11
* | Bluetooth: Check if the hci connection exists in SCO shutdownGustavo Padovan2013-01-101-1/+1
* | Bluetooth: Fix authentication if acl data comes before remote feature evtJaganath Kanakkassery2013-01-102-8/+11
* | Bluetooth: Fix incorrect strncpy() in hidp_setup_hid()Anderson Lizardo2013-01-091-1/+1
* | Bluetooth: Fix sending HCI commands after resetSzymon Janc2013-01-091-1/+1
|/
* mac80211: fix maximum MTUChaitanya2013-01-031-10/+1Star
* mac80211: fix dtim_period in hidden SSID AP associationJohannes Berg2013-01-033-37/+55
* mac80211: use del_timer_sync for final sta cleanup timer deletionJohannes Berg2013-01-031-1/+1
* mac80211: fix station destruction in AP/mesh modesJohannes Berg2013-01-034-17/+62
* mac80211: RMC buckets are just list headsThomas Pedersen2013-01-032-5/+5
* mac80211: assign VLAN channel contextsJohannes Berg2013-01-033-3/+45
* mac80211: flush AP_VLAN stations when tearing down the BSS APFelix Fietkau2013-01-031-0/+2
* mac80211: fix ibss scanningStanislaw Gruszka2013-01-033-18/+31
* Merge branch 'for-3.8' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2012-12-205-60/+61
|\
| * nfsd4: cleanup: replace rq_resused count by rq_next_page pointerJ. Bruce Fields2012-12-184-7/+11
| * svcrpc: fix some printksJ. Bruce Fields2012-12-171-4/+4
| * SUNRPC: remove redundant "linux/nsproxy.h" includesStanislav Kinsbursky2012-12-102-2/+0Star
| * svcrpc: support multiple-fragment rpc'sJ. Bruce Fields2012-12-041-25/+25
| * svcrpc: track rpc data length separately from sk_tcplenJ. Bruce Fields2012-12-041-7/+12
| * svcrpc: fix off-by-4 error in "incomplete TCP record" dprintkJ. Bruce Fields2012-12-041-1/+2
| * svcrpc: delay minimum-rpc-size check till laterJ. Bruce Fields2012-12-041-9/+7Star
| * svcrpc: don't byte-swap sk_reclen in placeJ. Bruce Fields2012-12-041-15/+11Star
| * svcrpc: demote some printks to a dprintkJ. Bruce Fields2012-11-081-3/+2Star
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2012-12-204-111/+105Star
|\ \
| * | libceph: register request before unregister lingerAlex Elder2012-12-201-1/+1
| * | libceph: don't use rb_init_node() in ceph_osdc_alloc_request()Alex Elder2012-12-201-1/+1
| * | libceph: init event->node in ceph_osdc_create_event()Alex Elder2012-12-201-0/+1
| * | libceph: init osd->o_node in create_osd()Alex Elder2012-12-201-0/+1
| * | libceph: report connection fault with warningAlex Elder2012-12-201-1/+1
| * | libceph: socket can close in any connection stateAlex Elder2012-12-171-17/+30
| * | rbd: remove linger unconditionallyAlex Elder2012-12-171-1/+1
| * | libceph: avoid using freed osd in __kick_osd_requests()Alex Elder2012-12-171-1/+2
| * | ceph: don't reference req after putAlex Elder2012-12-171-1/+1
| * | libceph: remove 'osdtimeout' optionSage Weil2012-12-132-45/+5Star
| * | libceph: define ceph_pg_pool_name_by_id()Alex Elder2012-11-011-0/+16