Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0318f685 authored by Ira Weiny's avatar Ira Weiny Committed by Roland Dreier
Browse files

IB/qib: Move COUNTER_MASK definition within qib_mad.h header guards 



Commit 36a8f01c ("IB/qib: Add congestion control agent
implementation") caused statements to leak pass the header guard.
Fix this.

Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent b29b0763

drivers/infiniband/hw/qib/qib_mad.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -415,7 +415,6 @@ struct cc_table_shadow { 
	struct ib_cc_table_entry_shadow entries[CC_TABLE_SHADOW_MAX];

	struct ib_cc_table_entry_shadow entries[CC_TABLE_SHADOW_MAX];

} __packed;

} __packed;





#endif				/* _QIB_MAD_H */

/*

/*

 * The PortSamplesControl.CounterMasks field is an array of 3 bit fields

 * 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.

 * 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, 2) | \

		    COUNTER_MASK(1, 3) | \

		    COUNTER_MASK(1, 3) | \

		    COUNTER_MASK(1, 4))

		    COUNTER_MASK(1, 4))



#endif				/* _QIB_MAD_H */