Re: linux-next: manual merge of the net tree with Linus' tree
flat view
From: Dmitry Kravkov <hidden>
Date: 2011-09-19 16:04:46
Also in:
linux-next, lkml
Subsystem:
broadcom bnx2x 10 gigabit ethernet driver, networking drivers, the rest · Maintainers:
Sudarsana Kalluru, Manish Chopra, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
On Mon, 2011-09-19 at 08:54 -0700, Joe Perches wrote:
On Mon, 2011-09-19 at 09:55 +0300, Dmitry Kravkov wrote:quoted
On Sun, 2011-09-18 at 21:51 -0700, Stephen Rothwell wrote:quoted
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.[]quoted
Can you use this one instead? Contains spell fixes and some formatting.Multiple line format strings lines are bad style and error prone. You introduce broken spacing after string coalescing.
Contains spell fixes and some formatting v2: fix broken spacing Signed-off-by: Dmitry Kravkov <redacted> --- Joe, Thanks for noticing that --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 30 ++++++++-------------- 1 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index 8e9b87b..5a9444a 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"); + "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. - */ + "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