aboutsummaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-2.6.26' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2008-05-205-212/+218
|\
| * Merge branch 'from-tomtucker' into for-2.6.26J. Bruce Fields2008-05-204-210/+216
| |\
| | * svcrdma: Verify read-list fits within RPCSVC_MAXPAGESTom Tucker2008-05-191-0/+2
| | * svcrdma: Change svc_rdma_send_error return type to voidTom Tucker2008-05-192-6/+5
| | * svcrdma: Copy transport address and arm CQ before calling rdma_acceptTom Tucker2008-05-191-9/+14
| | * svcrdma: Set rqstp transport address in rdma_read_complete functionTom Tucker2008-05-191-0/+1
| | * svcrdma: Use ib verbs version of dma_unmapTom Tucker2008-05-191-4/+4
| | * svcrdma: Cleanup queued, but unprocessed I/O in svc_rdma_freeTom Tucker2008-05-191-3/+35
| | * svcrdma: Move the QP and cm_id destruction to svc_rdma_freeTom Tucker2008-05-191-20/+20
| | * svcrdma: Add reference for each SQ/RQ WRTom Tucker2008-05-191-2/+16
| | * svcrdma: Move destroy to kernel threadTom Tucker2008-05-191-3/+14
| | * svcrdma: Shrink scope of spinlock on RQ CQTom Tucker2008-05-191-2/+2
| | * svcrdma: Use standard Linux lists for context cacheTom Tucker2008-05-191-21/+26
| | * svcrdma: Simplify RDMA_READ deferral buffer managementTom Tucker2008-05-192-48/+15
| | * svcrdma: Remove unused READ_DONE context flags bitTom Tucker2008-05-192-2/+0
| | * svcrdma: Return error from rdma_read_xdr so caller knows to free contextTom Tucker2008-05-191-7/+16
| | * svcrdma: Fix error handling during listening endpoint creationTom Tucker2008-05-191-11/+13
| | * svcrdma: Free context on post_recv error in send_replyTom Tucker2008-05-191-1/+2
| | * svcrdma: Free context on ib_post_recv errorTom Tucker2008-05-191-0/+2
| | * svcrdma: Add put of connection ESTABLISHED reference in rdma_cma_handlerTom Tucker2008-05-191-0/+1
| | * svcrdma: Fix return value in svc_rdma_sendTom Tucker2008-05-191-1/+1
| | * svcrdma: Fix race with dto_tasklet in svc_rdma_sendTom Tucker2008-05-191-18/+22
| | * svcrdma: Simplify receive buffer postingTom Tucker2008-05-193-35/+11
| | * svc: Remove unused header files from svc_xprt.cTom Tucker2008-05-191-21/+0
| | * svc: Remove extra check for XPT_DEAD bit in svc_xprt_enqueueTom Tucker2008-05-191-2/+0
| * | svcrpc: fix proc/net/rpc/auth.unix.ip/content displayJ. Bruce Fields2008-05-181-2/+2
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-05-2012-50/+153
|\ \
| * | pktgen: make sure that pktgen_thread_worker has been executedDenis V. Lunev2008-05-201-0/+4
| * | [VLAN]: Propagate selected feature bits to VLAN devicesPatrick McHardy2008-05-203-0/+37
| * | vlan: Correctly handle device notifications for layered VLAN devicesPatrick McHardy2008-05-201-3/+1
| * | net: Fix call to ->change_rx_flags(dev, IFF_MULTICAST) in dev_change_flags()David Woodhouse2008-05-201-1/+1
| * | net_sched: cls_api: fix return value for non-existant classifiersPatrick McHardy2008-05-201-1/+1
| * | ipsec: Use the correct ip_local_out functionHerbert Xu2008-05-202-2/+2
| * | ipv6 addrconf: Allow infinite prefix lifetime.YOSHIFUJI Hideaki2008-05-192-25/+52
| * | ipv6 route: Fix lifetime in netlink.YOSHIFUJI Hideaki2008-05-191-1/+3
| * | ipv6 addrconf: Fix route lifetime setting in corner case.YOSHIFUJI Hideaki2008-05-191-1/+1
| * | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville...David S. Miller2008-05-192-10/+41
| |\ \
| | * | mac80211: Add RTNL version of ieee80211_iterate_active_interfacesIvo van Doorn2008-05-161-1/+36
| | * | mac80211 : Association with 11n hidden ssid ap.Abhijeet Kolekar2008-05-161-9/+5
| * | | ndisc: Add missing strategies for per-device retrans timer/reachable time set...YOSHIFUJI Hideaki2008-05-192-5/+5
| |/ /
| * | net: handle errors from device_renameStephen Hemminger2008-05-141-1/+5
| |/
* | SUNRPC: AUTH_SYS "machine creds" shouldn't use negative valued uid/gidTrond Myklebust2008-05-181-4/+4
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/eri...Linus Torvalds2008-05-1410-95/+524
|\
| * 9p: fix error path during early mountEric Van Hensbergen2008-05-144-20/+23
| * 9p: make cryptic unknown error from server less scaryEric Van Hensbergen2008-05-141-2/+2
| * 9p: fix flags length in netSteven Rostedt2008-05-142-3/+3
| * 9p: Correct fidpool creation failure in p9_client_createJosef 'Jeff' Sipek2008-05-141-1/+1
| * 9p: use struct mutex instead of struct semaphoreJosef 'Jeff' Sipek2008-05-141-9/+9
| * 9p: propagate parse_option changes to client and transportsEric Van Hensbergen2008-05-142-14/+45
| * 9p: Documentation updatesEric Van Hensbergen2008-05-147-46/+441