diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:20:37 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:20:37 -0400 |
| commit | 3557b18fcbe0e29706214f3c7cc680a7823605eb (patch) | |
| tree | 2a70696b78a9e8b5ba38090901301931d395ecfb /drivers/infiniband/hw/ipath/ipath_mad.c | |
| parent | 4226ab93d8ae3fd895abe45879fe34d489a98718 (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into x86/ptemask
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_mad.c')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_mad.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_mad.c b/drivers/infiniband/hw/ipath/ipath_mad.c index 1ff46ae7dd99..5f9315d77a43 100644 --- a/drivers/infiniband/hw/ipath/ipath_mad.c +++ b/drivers/infiniband/hw/ipath/ipath_mad.c | |||
| @@ -1492,6 +1492,10 @@ static int process_subn(struct ib_device *ibdev, int mad_flags, | |||
| 1492 | goto bail; | 1492 | goto bail; |
| 1493 | } | 1493 | } |
| 1494 | 1494 | ||
| 1495 | case IB_MGMT_METHOD_TRAP: | ||
| 1496 | case IB_MGMT_METHOD_REPORT: | ||
| 1497 | case IB_MGMT_METHOD_REPORT_RESP: | ||
| 1498 | case IB_MGMT_METHOD_TRAP_REPRESS: | ||
| 1495 | case IB_MGMT_METHOD_GET_RESP: | 1499 | case IB_MGMT_METHOD_GET_RESP: |
| 1496 | /* | 1500 | /* |
| 1497 | * The ib_mad module will call us to process responses | 1501 | * The ib_mad module will call us to process responses |