summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2009-06-2427-61/+98
|\
| * ipv4 routing: Ensure that route cache entries are usable and reclaimable with...Neil Horman2009-06-231-3/+23
| * net: Move rx skb_orphan call to where neededHerbert Xu2009-06-234-7/+2
| * ipv6: Use correct data types for ICMPv6 type and codeBrian Haley2009-06-2316-32/+32
| * netfilter: xt_rateest: fix comparison with selfPatrick McHardy2009-06-221-1/+1
| * netfilter: xt_quota: fix incomplete initializationJan Engelhardt2009-06-221-0/+1
| * netfilter: nf_log: fix direct userspace memory access in proc handlerPatrick McHardy2009-06-221-5/+11
| * netfilter: fix some sparse endianess warningsPatrick McHardy2009-06-222-8/+8
| * netfilter: nf_conntrack: fix conntrack lookup racePatrick McHardy2009-06-221-2/+4
| * netfilter: nf_conntrack: fix confirmation race conditionPatrick McHardy2009-06-221-1/+8
| * netfilter: nf_conntrack: death_by_timeout() fixEric Dumazet2009-06-221-2/+8
* | Merge branch 'for-2.6.31' of git://fieldses.org/git/linux-nfsdLinus Torvalds2009-06-224-60/+129
|\ \
| * | SUNRPC: Fix the TCP server's send buffer accountingTrond Myklebust2009-06-181-17/+18
| * | sunrpc: potential memory leak in function rdma_read_xdrChristian Engelmayer2009-06-151-4/+4
| * | sunrpc: align cache_clean work's timerAnton Blanchard2009-06-151-1/+1
| * | Merge commit 'v2.6.30' into for-2.6.31J. Bruce Fields2009-06-1585-763/+961
| |\ \
| * | | SUNRPC: Clean up one_sock_name()Chuck Lever2009-04-281-10/+11
| * | | SUNRPC: Support PF_INET6 in one_sock_name()Chuck Lever2009-04-281-0/+7
| * | | SUNRPC: Switch one_sock_name() to use snprintf()Chuck Lever2009-04-281-7/+18
| * | | SUNRPC: pass buffer size to svc_sock_names()Chuck Lever2009-04-281-2/+17
| * | | SUNRPC: pass buffer size to svc_addsock()Chuck Lever2009-04-281-3/+13
| * | | NFSD: Prevent a buffer overflow in svc_xprt_names()Chuck Lever2009-04-281-17/+39
| * | | SUNRPC: Fix error return value of svc_addr_len()Chuck Lever2009-04-281-3/+4
| * | | net/sunrpc/svc_xprt.c: fix sparse warningsH Hartley Sweeten2009-04-281-0/+1
* | | | Merge branch 'for-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2009-06-2211-75/+928
|\ \ \ \
| * | | | nfs41: sunrpc: xprt_alloc_bc_request() should not use spin_lock_bh()Ricardo Labiaga2009-06-201-2/+5
| * | | | Merge branch 'devel-for-2.6.31' into for-2.6.31Trond Myklebust2009-06-181-0/+1
| |\ \ \ \
| | * | | | SUNRPC: Fix a missing "break" option in xs_tcp_setup_socket()Trond Myklebust2009-06-171-0/+1
| * | | | | Merge commit 'linux-pnfs/nfs41-for-2.6.31' into nfsv41-for-2.6.31Trond Myklebust2009-06-1711-75/+924
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | nfs41: Rename rq_received to rq_reply_bytes_recvdRicardo Labiaga2009-06-174-13/+14
| | * | | | nfs41: Get the rpc_xprt * from the rpc_rqst instead of the rpc_clnt.Rahul Iyer2009-06-171-2/+2
| | * | | | nfs41: create a svc_xprt for nfs41 callback thread and use for incoming callb...Benny Halevy2009-06-171-0/+1
| | * | | | nfs41: sunrpc: add a struct svc_xprt pointer to struct svc_serv for backchann...Andy Adamson2009-06-171-0/+4
| | * | | | nfs41: sunrpc: provide functions to create and destroy a svc_xprt for backcha...Benny Halevy2009-06-171-0/+39
| | * | | | nfs41: Backchannel bc_svc_process()Ricardo Labiaga2009-06-171-0/+49
| | * | | | nfs41: Refactor svc_process()Ricardo Labiaga2009-06-171-30/+50
| | * | | | nfs41: Backchannel callback service helper routinesRicardo Labiaga2009-06-173-1/+85
| | * | | | nfs41: Add backchannel processing support to RPC state machineRicardo Labiaga2009-06-174-9/+189
| | * | | | nfs41: New xs_tcp_read_data()Ricardo Labiaga2009-06-171-18/+126
| | * | | | nfs41: New backchannel helper routinesRicardo Labiaga2009-06-172-0/+279
| | * | | | nfs41: Initialize new rpc_xprt callback related fieldsRicardo Labiaga2009-06-171-0/+5
| | * | | | nfs41: Process the RPC call directionRicardo Labiaga2009-06-172-8/+28
| | * | | | nfs41: Add ability to read RPC call direction on TCP stream.Ricardo Labiaga2009-06-171-3/+49
| | * | | | nfs41: sunrpc: Export the call prepare state for session resetAndy Adamson2009-06-172-1/+14
| | | |/ / | | |/| |
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2009-06-225-162/+312
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2009-06-202-33/+118
| |\ \ \ \
| | * | | | cfg80211: validate station settingsJohannes Berg2009-06-191-16/+78
| | * | | | cfg80211: allow setting station parameters in meshAndrey Yurovsky2009-06-191-1/+2
| | * | | | cfg80211: allow adding/deleting stations on meshAndrey Yurovsky2009-06-191-2/+4
| | * | | | rfkill: export persistent attribute in sysfsAlan Jenkins2009-06-191-0/+10