summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/core
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-07-223-41/+52
|\
| *---. Merge branches 'cma', 'cxgb4', 'ipath', 'misc', 'mlx4', 'mthca', 'qib' and 's...Roland Dreier2011-07-222-1/+8
| |\ \ \
| | | | * IB/core: Add GID change eventOr Gerlitz2011-07-181-1/+2
| | | |/ | | |/|
| | | * RDMA: Allow for NULL .modify_device() and .modify_port() methodsBart Van Assche2011-07-181-0/+6
| | |/
| * | RDMA/cma: Don't allow IPoIB port space for IBoEMoni Shoua2011-07-181-0/+4
| * | RDMA/cma: Avoid assigning an IS_ERR value to cm_id pointer in CMA id objectJack Morgenstein2011-07-181-40/+40
| |/
* | net: Abstract dst->neighbour accesses behind helpers.David S. Miller2011-07-171-3/+4
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-07-142-2/+4
|\|
| * RDMA: Check for NULL mode in .devnode methodsGoldwyn Rodrigues2011-07-042-2/+4
* | rtnetlink: Compute and store minimum ifinfo dump sizeGreg Rose2011-06-091-1/+1
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-05-269-119/+471
|\
| *-----. Merge branches 'cma', 'cxgb3', 'cxgb4', 'misc', 'nes', 'netlink', 'srp' and '...Roland Dreier2011-05-259-116/+466
| |\ \ \ \
| | | | | * IB/uverbs: Add devnode method to set path/modeRoland Dreier2011-05-231-0/+8
| | | |_|/ | | |/| |
| | | | * RDMA/cma: Save PID of ID's ownerNir Muchtar2011-05-251-0/+6
| | | | * RDMA/cma: Add support for netlink statistics exportNir Muchtar2011-05-251-0/+99
| | | | * RDMA/cma: Pass QP type into rdma_create_id()Sean Hefty2011-05-252-23/+39
| | | | * RDMA/cma: Export enum cma_state in <rdma/rdma_cm.h>Nir Muchtar2011-05-251-90/+80
| | | | * RDMA: Add netlink infrastructureRoland Dreier2011-05-203-2/+203
| | | | * RDMA: Add error handling to ib_core_init()Nir Muchtar2011-05-201-3/+11
| | | |/ | | |/|
| | | * IB: Add devnode methods to cm_class and umad_classRoland Dreier2011-05-232-0/+15
| | | * IB/mad: Return EPROTONOSUPPORT when an RDMA device lacks the QP requiredIra Weiny2011-05-231-0/+7
| | |/
| * / RDMA/ucma: Add .nodename/.mode to tell userspace where to create device nodeRoland Dreier2011-05-231-3/+5
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-05-201-2/+7
|\ \ | |/ |/|
| * infiniband: Remove rt->rt_src usage in addr4_resolve()David S. Miller2011-05-101-2/+7
* | RDMA/iwcm: Get rid of enum iw_cm_event_statusRoland Dreier2011-05-091-1/+1
* | RDMA/cma: Add an ID_REUSEADDR optionHefty, Sean2011-05-092-67/+130
* | RDMA/cma: Fix handling of IPv6 addressing in cma_use_portHefty, Sean2011-05-091-7/+22
|/
* IB/mad: Improve an error message so error code is includedMichael Heinz2011-03-181-1/+2
* RDMA/addr: Fix return of uninitialized ret valueSean Hefty2011-03-171-1/+1
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-03-161-18/+13
|\
| * ipv6: Convert to use flowi6 where applicable.David S. Miller2011-03-121-9/+9
| * net: Put flowi_* prefix on AF independent members of struct flowiDavid S. Miller2011-03-121-1/+1
| * ipv4: Create and use route lookup helpers.David S. Miller2011-03-121-7/+1
| * ipv4: Make output route lookup return rtable directly.David S. Miller2011-03-021-3/+4
* | RDMA/cma: Replace global lock in rdma_destroy_id() with id-specific oneSean Hefty2011-03-151-27/+16
* | IB/cm: Cancel pending LAP message when exiting IB_CM_ESTABLISH stateSean Hefty2011-03-151-1/+18
* | IB/cm: Bump reference count on cm_id before invoking callbackSean Hefty2011-03-151-0/+1
* | RDMA/cma: Fix crash in request handlersSean Hefty2011-03-151-0/+15
|/
*-. Merge branches 'amso1100', 'cma', 'cxgb4', 'misc', 'mlx4' and 'qib' into for-...Roland Dreier2011-01-292-3/+21
|\ \
| | * RDMA: Update missed conversion of flush_scheduled_work()Tejun Heo2011-01-281-1/+1
| |/ |/|
| * RDMA/ucma: Copy iWARP route information on queriesSteve Wise2011-01-281-2/+20
|/
* RDMA: Update workqueue usageTejun Heo2011-01-164-6/+13
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-12-263-73/+60
|\
| * IB/uverbs: Handle large number of entries in poll CQDan Carpenter2010-12-081-43/+56
| * IB: Fix information leak in marshalling codeVasiliy Kulikov2010-12-011-0/+4
| * IB/pack: Remove some unused code added by the IBoE patchesOr Gerlitz2010-12-011-30/+0
* | infiniband: remove dev_base_lock useEric Dumazet2010-11-241-3/+3
* | net: get rid of rtable->idevEric Dumazet2010-11-111-4/+4
|/
*---. Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iboe', 'ipoib', ...Roland Dreier2010-10-2612-87/+606
|\ \ \
| | | * RDMA/iwcm: Fix hang in uninterruptible wait on cm_id destroyAnimesh K Trivedi2010-10-111-0/+4