Patchwork bnx2x: move debugging code before the return

login
register
mail settings
Submitter Dan Carpenter
Date Jan. 10, 2013, 8:58 a.m.
Message ID <20130110085807.GB23063@elgon.mountain>
Download mbox | patch
Permalink /patch/210953/
State Accepted
Delegated to: David Miller
Headers show

Comments

Dan Carpenter - Jan. 10, 2013, 8:58 a.m.
I move the return down a line after the debugging printk.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.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
Ariel Elior - Jan. 10, 2013, 9:53 a.m.
> -----Original Message-----
> From: netdev-owner@vger.kernel.org [mailto:netdev-
> owner@vger.kernel.org] On Behalf Of Dan Carpenter
> Sent: Thursday, January 10, 2013 10:58 AM
> To: Eilon Greenstein
> Cc: netdev@vger.kernel.org; kernel-janitors@vger.kernel.org
> Subject: [patch] bnx2x: move debugging code before the return
> 
> I move the return down a line after the debugging printk.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
> b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
> index 292634f..d7029c8 100644
> --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
> +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
> @@ -2768,10 +2768,10 @@ static int bnx2x_set_rss_flags(struct bnx2x *bp,
> struct ethtool_rxnfc *info)
>  		} else if ((info->flow_type == UDP_V6_FLOW) &&
>  			   (bp->rss_conf_obj.udp_rss_v6 !=
> udp_rss_requested)) {
>  			bp->rss_conf_obj.udp_rss_v6 = udp_rss_requested;
> -			return bnx2x_config_rss_pf(bp, &bp->rss_conf_obj,
> 0);
>  			DP(BNX2X_MSG_ETHTOOL,
>  			   "rss re-configured, UDP 4-tupple %s\n",
>  			   udp_rss_requested ? "enabled" : "disabled");
> +			return bnx2x_config_rss_pf(bp, &bp->rss_conf_obj,
> 0);
>  		} else {
>  			return 0;
>  		}
> --
> 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

Thanks Dan.
Acked-by: Ariel Elior <ariele@broadcom.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
David Miller - Jan. 10, 2013, 10:39 p.m.
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 10 Jan 2013 11:58:07 +0300

> I move the return down a line after the debugging printk.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Applied.
--
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

Patch

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index 292634f..d7029c8 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -2768,10 +2768,10 @@  static int bnx2x_set_rss_flags(struct bnx2x *bp, struct ethtool_rxnfc *info)
 		} else if ((info->flow_type == UDP_V6_FLOW) &&
 			   (bp->rss_conf_obj.udp_rss_v6 != udp_rss_requested)) {
 			bp->rss_conf_obj.udp_rss_v6 = udp_rss_requested;
-			return bnx2x_config_rss_pf(bp, &bp->rss_conf_obj, 0);
 			DP(BNX2X_MSG_ETHTOOL,
 			   "rss re-configured, UDP 4-tupple %s\n",
 			   udp_rss_requested ? "enabled" : "disabled");
+			return bnx2x_config_rss_pf(bp, &bp->rss_conf_obj, 0);
 		} else {
 			return 0;
 		}