diff options
| author | Ira Weiny <ira.weiny@intel.com> | 2013-08-20 15:25:08 (GMT) |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2013-09-03 04:22:20 (GMT) |
| commit | 0318f685213e04109d408ac04d8c0d11bb6b15f3 (patch) | |
| tree | 4561812f69dd98895ff96edcb5fd006d7ed54042 | |
| parent | b29b0763949de035fd9341b70f869bd6f400ea4e (diff) | |
| download | linux-0318f685213e04109d408ac04d8c0d11bb6b15f3.tar.xz | |
IB/qib: Move COUNTER_MASK definition within qib_mad.h header guards
Commit 36a8f01cd24b ("IB/qib: Add congestion control agent
implementation") caused statements to leak pass the header guard.
Fix this.
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_mad.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_mad.h b/drivers/infiniband/hw/qib/qib_mad.h index 57bd3fa..28874f86 100644 --- a/drivers/infiniband/hw/qib/qib_mad.h +++ b/drivers/infiniband/hw/qib/qib_mad.h @@ -415,7 +415,6 @@ struct cc_table_shadow { struct ib_cc_table_entry_shadow entries[CC_TABLE_SHADOW_MAX]; } __packed; -#endif /* _QIB_MAD_H */ /* * The PortSamplesControl.CounterMasks field is an array of 3 bit fields * which specify the N'th counter's capabilities. See ch. 16.1.3.2. @@ -428,3 +427,5 @@ struct cc_table_shadow { COUNTER_MASK(1, 2) | \ COUNTER_MASK(1, 3) | \ COUNTER_MASK(1, 4)) + +#endif /* _QIB_MAD_H */ |