]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
IB/qib: Move COUNTER_MASK definition within qib_mad.h header guards
authorIra Weiny <ira.weiny@intel.com>
Tue, 20 Aug 2013 15:25:08 +0000 (08:25 -0700)
committerRoland Dreier <roland@purestorage.com>
Tue, 3 Sep 2013 04:22:20 +0000 (21:22 -0700)
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>
drivers/infiniband/hw/qib/qib_mad.h

index 57bd3fa016bc3dad3df93a144bbd9a4d3e7f8eec..28874f8606f888ee0a7a816cf180b654f622bc32 100644 (file)
@@ -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 */