ntb: intel: fix return value for ndev_vec_mask()

davejiang · jonmason · commit 7756e2b5d68c · 2018-10-31T16:07:26.000-04:00
ndev_vec_mask() should be returning u64 mask value instead of int. Otherwise the mask value returned can be incorrect for larger vectors. Fixes: e26a584 ("NTB: Split ntb_hw_intel and ntb_transport drivers") Signed-off-by: Dave Jiang <dave.jiang@intel.com> Tested-by: Lucas Van <lucas.van@intel.com> Signed-off-by: Jon Mason <jdmason@kudzu.us>
diff --git a/drivers/ntb/hw/intel/ntb_hw_gen1.c b/drivers/ntb/hw/intel/ntb_hw_gen1.c
@@ -265,7 +265,7 @@ static inline int ndev_db_clear_mask(struct intel_ntb_dev *ndev, u64 db_bits,
 	return 0;
 }
 
-static inline int ndev_vec_mask(struct intel_ntb_dev *ndev, int db_vector)
+static inline u64 ndev_vec_mask(struct intel_ntb_dev *ndev, int db_vector)
 {
 	u64 shift, mask;
 

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ static inline int ndev_db_clear_mask(struct intel_ntb_dev *ndev, u64 db_bits,`
`265`	`265`	`return 0;`
`266`	`266`	`}`
`267`	`267`
`268`		`-static inline int ndev_vec_mask(struct intel_ntb_dev *ndev, int db_vector)`
	`268`	`+static inline u64 ndev_vec_mask(struct intel_ntb_dev *ndev, int db_vector)`
`269`	`269`	`{`
`270`	`270`	`u64 shift, mask;`
`271`	`271`