From 0aebc48229d4b445f6d42046df12a26aeaa9c62b Mon Sep 17 00:00:00 2001 From: Dmitry Kravkov Date: Sun, 13 Nov 2011 04:34:27 +0000 Subject: [PATCH] --- yaml --- r: 277515 b: refs/heads/master c: b363782761eea7076619fe44063b915dae0b4cc7 h: refs/heads/master i: 277513: 745250fd485b4a145ecc95ca1cfbcc154806228c 277511: d7217a87722492c056548fc3e6388757e0cedbe8 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 3 +-- trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 695cfe9f1ec2..b2c82c2c9180 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9c058b633000e64fba05fc14ba94dd09a20e674 +refs/heads/master: b363782761eea7076619fe44063b915dae0b4cc7 diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h index e17a739c6753..b78c3844e838 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h @@ -411,8 +411,7 @@ union db_prod { /* Number of u64 elements in SGE mask array */ -#define RX_SGE_MASK_LEN ((NUM_RX_SGE_PAGES * RX_SGE_CNT) / \ - BIT_VEC64_ELEM_SZ) +#define RX_SGE_MASK_LEN (NUM_RX_SGE / BIT_VEC64_ELEM_SZ) #define RX_SGE_MASK_LEN_MASK (RX_SGE_MASK_LEN - 1) #define NEXT_SGE_MASK_ELEM(el) (((el) + 1) & RX_SGE_MASK_LEN_MASK) diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h index 59f1291b2f78..260226d09916 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h @@ -874,8 +874,7 @@ static inline void bnx2x_clear_sge_mask_next_elems(struct bnx2x_fastpath *fp) static inline void bnx2x_init_sge_ring_bit_mask(struct bnx2x_fastpath *fp) { /* Set the mask to all 1-s: it's faster to compare to 0 than to 0xf-s */ - memset(fp->sge_mask, 0xff, - (NUM_RX_SGE >> BIT_VEC64_ELEM_SHIFT)*sizeof(u64)); + memset(fp->sge_mask, 0xff, sizeof(fp->sge_mask)); /* Clear the two last indices in the page to 1: these are the indices that correspond to the "next" element,