summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211John W. Linville2014-05-122-5/+8
|\
| * mac80211: fix vif name tracingEliad Peller2014-05-091-2/+2
| * mac80211: allow VHT with peers not capable of 40MHzJohannes Berg2014-05-091-3/+6
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211John W. Linville2014-05-066-9/+18
|\ \ | |/
| * mac80211: fix nested rtnl locking on ieee80211_reconfigEliad Peller2014-05-051-1/+1
| * cfg80211: add cfg80211_sched_scan_stopped_rtnlEliad Peller2014-05-051-2/+10
| * cfg80211: free sme on connection failuresEliad Peller2014-05-051-1/+1
| * mac80211: Fix mac80211 station info rx bitrate for IBSS modeHenning Rogge2014-05-051-1/+2
| * mac80211: fixup radiotap tx flags for RTS/CTSBob Copeland2014-04-221-3/+2
| * mac80211: avoid handling of SMPS for meshChun-Yeow Yeoh2014-04-221-1/+2
* | Bluetooth: Fix redundant encryption request for reauthenticationJohan Hedberg2014-04-251-3/+6
* | Bluetooth: Fix triggering BR/EDR L2CAP Connect too earlyJohan Hedberg2014-04-251-0/+6
* | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2014-04-144-3/+14
|\ \ | |/
| * mac80211: exclude AP_VLAN interfaces from tx power calculationFelix Fietkau2014-04-111-0/+2
| * mac80211: suppress BSS info change notifications for AP_VLANFelix Fietkau2014-04-111-1/+1
| * mac80211: update last_tx_rate only for data frameChun-Yeow Yeoh2014-04-091-0/+1
| * mac80211: fix radar_enabled propagationMichal Kazior2014-04-091-2/+2
| * mac80211: Disable SMPS for the monitor interfaceIdo Yariv2014-04-091-0/+7
| * mac80211: fix software remain-on-channel implementationJohannes Berg2014-04-091-0/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-04-1252-114/+119
|\ \
| * | vti: don't allow to add the same tunnel twiceNicolas Dichtel2014-04-121-1/+1
| * | gre: don't allow to add the same tunnel twiceNicolas Dichtel2014-04-121-1/+1
| * | pktgen: be friendly to LLTX devicesDaniel Borkmann2014-04-121-2/+6
| * | net: ipv6: Fix oif in TCP SYN+ACK route lookup.Lorenzo Colitti2014-04-111-1/+1
| * | net: Fix use after free by removing length arg from sk_data_ready callbacks.David S. Miller2014-04-1145-98/+90
| * | bridge: Fix double free and memory leak around br_allowed_ingressToshiaki Makita2014-04-112-4/+5
| * | net: core: don't account for udp header size when computing seglenFlorian Westphal2014-04-101-5/+7
| * | l2tp: take PMTU from tunnel UDP socketDmitry Petukhov2014-04-091-2/+2
| * | net: sctp: test if association is dead in sctp_wake_up_waitersDaniel Borkmann2014-04-091-0/+6
| |/
* | Merge tag 'for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/e...Linus Torvalds2014-04-114-72/+92
|\ \
| * | 9pnet_rdma: check token type before int conversionSimon Derr2014-03-251-0/+2
| * | 9pnet: trans_fd : allocate struct p9_trans_fd and struct p9_conn together.Simon Derr2014-03-251-46/+25
| * | 9P: Get rid of REQ_STATUS_FLSHSimon Derr2014-03-252-6/+3
| * | 9pnet_rdma: add cancelled()Simon Derr2014-03-251-1/+14
| * | 9pnet_rdma: update request status during sendSimon Derr2014-03-251-0/+6
| * | 9P: Add cancelled() to the transport functions.Simon Derr2014-03-252-6/+20
| * | net: Mark function as static in 9p/client.cRashika2014-03-251-1/+1
| * | 9P: Add memory barriers to protect request fields over cb/rpc threads handoffDominique Martinet2014-03-254-14/+23
* | | Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2014-04-0811-86/+119
|\ \ \ | |_|/ |/| |
| * | nfsd: check passed socket's net matches NFSd superblock's oneStanislav Kinsbursky2014-03-311-0/+16
| * | SUNRPC: Clear xpt_bc_xprt if xs_setup_bc_tcp failedKinglong Mee2014-03-301-0/+2
| * | NFSD/SUNRPC: Check rpc_xprt out of xs_setup_bc_tcpKinglong Mee2014-03-302-21/+0
| * | SUNRPC: New helper for creating client with rpc_xprtKinglong Mee2014-03-301-25/+33
| * | NFSD: Free backchannel xprt in bc_destroyKinglong Mee2014-03-301-0/+4
| * | rpc: Allow xdr_buf_subsegment to operate in-placeJ. Bruce Fields2014-03-281-6/+16
| * | SUNRPC: fix memory leak of peer addresses in XPRTKinglong Mee2014-03-281-8/+11
| * | svcrdma: fix offset calculation for non-page aligned sge entriesJeff Layton2014-03-281-0/+1
| * | xprtrdma: add separate Kconfig options for NFSoRDMA client and server supportJeff Layton2014-03-283-16/+30
| * | Fix regression in NFSRDMA serverTom Tucker2014-03-282-8/+5
| * | net: Mark functions as static in net/sunrpc/svc_xprt.cRashika Kheria2014-03-271-3/+3
OpenPOWER on IntegriCloud