diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2017-04-12 21:59:01 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-04-12 21:59:01 -0700 |
| commit | bfca9acf1a5df0ff98fbf47e363adb48612bb7ec (patch) | |
| tree | a50287c88fdc60a73912d205d7bce41b7af53827 /drivers/net/ethernet/qlogic/qed/qed_dev.c | |
| parent | 92a3fa075d3d2716b9c662814540f1d660cbf2f5 (diff) | |
| parent | 11e63f6d920d6f2dfd3cd421e939a4aec9a58dcd (diff) | |
Merge branch 'for-4.11/libnvdimm' into for-4.12/dax
Diffstat (limited to 'drivers/net/ethernet/qlogic/qed/qed_dev.c')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qed/qed_dev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c index e2a081ceaf52..e518f914eab1 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_dev.c +++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c @@ -2389,9 +2389,8 @@ qed_chain_alloc_sanity_check(struct qed_dev *cdev, * size/capacity fields are of a u32 type. */ if ((cnt_type == QED_CHAIN_CNT_TYPE_U16 && - chain_size > 0x10000) || - (cnt_type == QED_CHAIN_CNT_TYPE_U32 && - chain_size > 0x100000000ULL)) { + chain_size > ((u32)U16_MAX + 1)) || + (cnt_type == QED_CHAIN_CNT_TYPE_U32 && chain_size > U32_MAX)) { DP_NOTICE(cdev, "The actual chain size (0x%llx) is larger than the maximal possible value\n", chain_size); |