| Message ID | 20101221070401.GF1936@bicker |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, 2010-12-20 at 23:04 -0800, Dan Carpenter wrote: > We dereferenced params on the line before so it's too late to check if > params is NULL. In fact, params can never be NULL and strict_cos is > either 0 or 1 so that part of the check is bogus too. Let's remove it. > > Signed-off-by: Dan Carpenter <error27@gmail.com> Thanks Dan! Acked-by: Eilon Greenstein <eilong@broadcom.com> > > diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c > index 97cbee2..43b0de2 100644 > --- a/drivers/net/bnx2x/bnx2x_link.c > +++ b/drivers/net/bnx2x/bnx2x_link.c > @@ -354,9 +354,6 @@ u8 bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos) > struct bnx2x *bp = params->bp; > u32 val = 0; > > - if ((1 < strict_cos) && (NULL == params)) > - return -EINVAL; > - > DP(NETIF_MSG_LINK, "ETS enabled strict configuration\n"); > /** > * Bitmap of 5bits length. Each bit specifies whether the entry behaves > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: "Eilon Greenstein" <eilong@broadcom.com> Date: Tue, 21 Dec 2010 15:48:36 +0200 > On Mon, 2010-12-20 at 23:04 -0800, Dan Carpenter wrote: >> We dereferenced params on the line before so it's too late to check if >> params is NULL. In fact, params can never be NULL and strict_cos is >> either 0 or 1 so that part of the check is bogus too. Let's remove it. >> >> Signed-off-by: Dan Carpenter <error27@gmail.com> > > Thanks Dan! > > Acked-by: Eilon Greenstein <eilong@broadcom.com> Applied, thanks everyone. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c index 97cbee2..43b0de2 100644 --- a/drivers/net/bnx2x/bnx2x_link.c +++ b/drivers/net/bnx2x/bnx2x_link.c @@ -354,9 +354,6 @@ u8 bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos) struct bnx2x *bp = params->bp; u32 val = 0; - if ((1 < strict_cos) && (NULL == params)) - return -EINVAL; - DP(NETIF_MSG_LINK, "ETS enabled strict configuration\n"); /** * Bitmap of 5bits length. Each bit specifies whether the entry behaves
We dereferenced params on the line before so it's too late to check if params is NULL. In fact, params can never be NULL and strict_cos is either 0 or 1 so that part of the check is bogus too. Let's remove it. Signed-off-by: Dan Carpenter <error27@gmail.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html