diff options
| author | Doug Ledford <dledford@redhat.com> | 2016-12-14 14:44:25 -0500 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-12-14 14:44:25 -0500 |
| commit | 86ef0beaa0bdbec70d4261977b8b4a100fe54bfe (patch) | |
| tree | d2c1b52a7a6e493bada10dbdbcd2f8511baccc66 /drivers/infiniband/hw/nes | |
| parent | 253f8b22e0ad643edafd75e831e5c765732877f5 (diff) | |
| parent | 7ceb740c540dde362b3055ad92c6a38009eb7a83 (diff) | |
Merge branch 'mlx' into merge-test
Diffstat (limited to 'drivers/infiniband/hw/nes')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_verbs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c index 42ab31d06ef9..aff9fb14768b 100644 --- a/drivers/infiniband/hw/nes/nes_verbs.c +++ b/drivers/infiniband/hw/nes/nes_verbs.c | |||
| @@ -771,7 +771,8 @@ static int nes_dealloc_pd(struct ib_pd *ibpd) | |||
| 771 | /** | 771 | /** |
| 772 | * nes_create_ah | 772 | * nes_create_ah |
| 773 | */ | 773 | */ |
| 774 | static struct ib_ah *nes_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr) | 774 | static struct ib_ah *nes_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr, |
| 775 | struct ib_udata *udata) | ||
| 775 | { | 776 | { |
| 776 | return ERR_PTR(-ENOSYS); | 777 | return ERR_PTR(-ENOSYS); |
| 777 | } | 778 | } |