diff options
author | Ira Weiny <ira.weiny@intel.com> | 2013-08-20 11:25:08 -0400 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2013-09-03 00:22:20 -0400 |
commit | 0318f685213e04109d408ac04d8c0d11bb6b15f3 (patch) | |
tree | 4561812f69dd98895ff96edcb5fd006d7ed54042 /drivers/infiniband | |
parent | b29b0763949de035fd9341b70f869bd6f400ea4e (diff) |
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>
Diffstat (limited to 'drivers/infiniband')
-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 57bd3fa016bc..28874f8606f8 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 { | |||
415 | struct ib_cc_table_entry_shadow entries[CC_TABLE_SHADOW_MAX]; | 415 | struct ib_cc_table_entry_shadow entries[CC_TABLE_SHADOW_MAX]; |
416 | } __packed; | 416 | } __packed; |
417 | 417 | ||
418 | #endif /* _QIB_MAD_H */ | ||
419 | /* | 418 | /* |
420 | * The PortSamplesControl.CounterMasks field is an array of 3 bit fields | 419 | * The PortSamplesControl.CounterMasks field is an array of 3 bit fields |
421 | * which specify the N'th counter's capabilities. See ch. 16.1.3.2. | 420 | * which specify the N'th counter's capabilities. See ch. 16.1.3.2. |
@@ -428,3 +427,5 @@ struct cc_table_shadow { | |||
428 | COUNTER_MASK(1, 2) | \ | 427 | COUNTER_MASK(1, 2) | \ |
429 | COUNTER_MASK(1, 3) | \ | 428 | COUNTER_MASK(1, 3) | \ |
430 | COUNTER_MASK(1, 4)) | 429 | COUNTER_MASK(1, 4)) |
430 | |||
431 | #endif /* _QIB_MAD_H */ | ||