From: "Dmitry Kravkov" <dmitry@broadcom.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Yaniv Rosner <yaniv.rosner@broadcom.com>,
Eilon Greenstein <eilong@broadcom.com>,
Joe Perches <joe@perches.com>
Subject: Re: linux-next: manual merge of the net tree with Linus' tree
Date: Mon, 19 Sep 2011 09:55:18 +0300 [thread overview]
Message-ID: <1316415318.26848.4.camel@lb-tlvb-dmitry> (raw)
In-Reply-To: <20110919145103.6c3e73edf51599eaa703294a@canb.auug.org.au>
On Sun, 2011-09-18 at 21:51 -0700, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c between commit
> c482e6c06461 ("bnx2x: Fix ETS bandwidth") from Linus' tree and commit
> 94f05b0f60de ("bnx2x: Coalesce pr_cont uses and fix DP typos") from the
> net tree.
>
> The former removes the code cleaned up by the latter, so I used the
> former (see below).
Can you use this one instead?
Contains spell fixes and some formatting.
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 34 ++++++++-------------
1 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index 8e9b87b..733ace0 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -850,32 +850,24 @@ static int bnx2x_ets_e3b0_get_total_bw(
*total_bw = 0 ;
/* Calculate total BW requested */
- for (cos_idx = 0; cos_idx < ets_params->num_of_cos; cos_idx++) {
- if (bnx2x_cos_state_bw == ets_params->cos[cos_idx].state) {
+ for (cos_idx = 0; cos_idx < ets_params->num_of_cos; cos_idx++)
+ if (bnx2x_cos_state_bw == ets_params->cos[cos_idx].state)
+ *total_bw +=
+ ets_params->cos[cos_idx].params.bw_params.bw;
- if (0 == ets_params->cos[cos_idx].params.bw_params.bw) {
- DP(NETIF_MSG_LINK,
- "bnx2x_ets_E3B0_config BW was set to 0\n");
- return -EINVAL;
- }
- *total_bw +=
- ets_params->cos[cos_idx].params.bw_params.bw;
- }
- }
-
- /*Check taotl BW is valid */
+ /* Check total BW is valid */
if ((100 != *total_bw) || (0 == *total_bw)) {
if (0 == *total_bw) {
- DP(NETIF_MSG_LINK,
- "bnx2x_ets_E3B0_config toatl BW shouldn't be 0\n");
+ DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config total BW"
+ "shouldn't be 0\n");
return -EINVAL;
}
- DP(NETIF_MSG_LINK,
- "bnx2x_ets_E3B0_config toatl BW should be 100\n");
- /**
- * We can handle a case whre the BW isn't 100 this can happen
- * if the TC are joined.
- */
+ DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config total BW should be"
+ "100\n");
+ /*
+ * We can handle a case where the BW isn't 100 this can happen
+ * if the TC are joined.
+ */
}
return 0;
}
--
1.7.2.2
next prev parent reply other threads:[~2011-09-19 6:55 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-19 4:51 linux-next: manual merge of the net tree with Linus' tree Stephen Rothwell
2011-09-19 6:55 ` Dmitry Kravkov [this message]
2011-09-19 15:54 ` Joe Perches
2011-09-19 16:04 ` Dmitry Kravkov
-- strict thread matches above, loose matches on Subject: below --
2022-12-07 21:23 Stephen Rothwell
2022-12-08 6:17 ` Juergen Gross
2021-03-18 21:29 Stephen Rothwell
2021-03-19 15:55 ` Leon Romanovsky
2021-03-20 19:28 ` Marc Kleine-Budde
2021-03-20 19:42 ` Linus Torvalds
2021-03-21 9:14 ` Leon Romanovsky
2020-06-09 23:30 Stephen Rothwell
2020-06-09 23:58 ` Arjun Roy
2019-11-19 21:07 Stephen Rothwell
2019-07-21 23:41 Stephen Rothwell
2018-06-28 22:14 Stephen Rothwell
2017-11-26 22:42 Stephen Rothwell
2016-10-15 21:13 Stephen Rothwell
2016-10-17 11:41 ` Mintz, Yuval
2011-09-22 5:16 Stephen Rothwell
2011-09-19 4:41 Stephen Rothwell
2011-07-18 4:41 Stephen Rothwell
2011-07-18 19:33 ` David Miller
2011-04-08 3:45 Stephen Rothwell
2011-04-08 3:49 ` David Miller
2010-12-26 23:41 Stephen Rothwell
2010-12-27 2:21 ` David Miller
2010-10-22 1:19 Stephen Rothwell
2010-07-21 2:04 Stephen Rothwell
2010-07-21 2:31 ` Herbert Xu
2010-07-21 3:27 ` David Miller
2010-07-21 3:44 ` Stephen Rothwell
2010-05-17 2:09 Stephen Rothwell
2010-05-17 5:28 ` David Miller
2010-05-17 6:24 ` Stephen Rothwell
2010-05-12 2:26 Stephen Rothwell
2010-04-27 1:28 Stephen Rothwell
2010-04-27 1:28 Stephen Rothwell
2010-04-28 0:05 ` David Miller
2010-04-28 0:47 ` Stephen Rothwell
2010-04-14 1:45 Stephen Rothwell
2010-04-14 1:47 ` David Miller
2010-04-14 1:52 ` Stephen Rothwell
2010-04-14 2:00 ` David Miller
2010-04-09 0:41 Stephen Rothwell
2010-04-07 2:58 Stephen Rothwell
2010-04-07 2:58 Stephen Rothwell
2010-04-07 3:20 ` Cong Wang
2010-04-07 5:28 ` Stephen Rothwell
2010-03-01 3:20 Stephen Rothwell
2010-03-01 3:21 ` David Miller
2010-01-11 2:31 Stephen Rothwell
2010-01-11 6:50 ` David Miller
2010-01-11 7:56 ` Stephen Rothwell
2010-01-11 7:59 ` David Miller
2010-01-11 8:49 ` Stephen Rothwell
2009-09-02 3:37 Stephen Rothwell
2009-09-02 7:33 ` David Miller
2009-09-02 8:52 ` Stephen Rothwell
2009-08-07 1:58 Stephen Rothwell
2009-06-03 2:20 Stephen Rothwell
2009-06-03 10:33 ` David Miller
2009-05-19 3:39 Stephen Rothwell
2009-05-19 4:09 ` David Miller
2009-05-19 4:43 ` Stephen Rothwell
2009-02-26 2:48 Stephen Rothwell
2009-02-27 7:17 ` David Miller
2009-02-02 3:13 Stephen Rothwell
2009-02-03 7:51 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1316415318.26848.4.camel@lb-tlvb-dmitry \
--to=dmitry@broadcom.com \
--cc=davem@davemloft.net \
--cc=eilong@broadcom.com \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=yaniv.rosner@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).