Skip to content

Commit

Permalink
IB/qib: Move COUNTER_MASK definition within qib_mad.h header guards
Browse files Browse the repository at this point in the history
Commit 36a8f01 ("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>
  • Loading branch information
Ira Weiny authored and Roland Dreier committed Sep 3, 2013
1 parent b29b076 commit 0318f68
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/infiniband/hw/qib/qib_mad.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -428,3 +427,5 @@ struct cc_table_shadow {
COUNTER_MASK(1, 2) | \
COUNTER_MASK(1, 3) | \
COUNTER_MASK(1, 4))

#endif /* _QIB_MAD_H */

0 comments on commit 0318f68

Please sign in to comment.