* [PATCH 1/1] ixgbe: add missing braces
@ 2012-08-10 17:35 Peter P Waskiewicz Jr
2012-08-10 23:51 ` David Miller
2012-08-11 0:34 ` Joe Perches
0 siblings, 2 replies; 3+ messages in thread
From: Peter P Waskiewicz Jr @ 2012-08-10 17:35 UTC (permalink / raw)
To: davem; +Cc: Emil Tantilov, netdev, gospo, sassmann, Peter P Waskiewicz Jr
From: Emil Tantilov <emil.s.tantilov@intel.com>
This patch adds missing braces around the 10gig link check to include the check for KR support.
Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Reported-by: Sascha Wildner <saw@online.de>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
index 50fc137..18bf08c 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
@@ -804,12 +804,13 @@ static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII) {
/* Set KX4/KX/KR support according to speed requested */
autoc &= ~(IXGBE_AUTOC_KX4_KX_SUPP_MASK | IXGBE_AUTOC_KR_SUPP);
- if (speed & IXGBE_LINK_SPEED_10GB_FULL)
+ if (speed & IXGBE_LINK_SPEED_10GB_FULL) {
if (orig_autoc & IXGBE_AUTOC_KX4_SUPP)
autoc |= IXGBE_AUTOC_KX4_SUPP;
if ((orig_autoc & IXGBE_AUTOC_KR_SUPP) &&
(hw->phy.smart_speed_active == false))
autoc |= IXGBE_AUTOC_KR_SUPP;
+ }
if (speed & IXGBE_LINK_SPEED_1GB_FULL)
autoc |= IXGBE_AUTOC_KX_SUPP;
} else if ((pma_pmd_1g == IXGBE_AUTOC_1G_SFI) &&
--
1.7.11.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/1] ixgbe: add missing braces
2012-08-10 17:35 [PATCH 1/1] ixgbe: add missing braces Peter P Waskiewicz Jr
@ 2012-08-10 23:51 ` David Miller
2012-08-11 0:34 ` Joe Perches
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2012-08-10 23:51 UTC (permalink / raw)
To: peter.p.waskiewicz.jr; +Cc: emil.s.tantilov, netdev, gospo, sassmann
From: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Date: Fri, 10 Aug 2012 10:35:14 -0700
> From: Emil Tantilov <emil.s.tantilov@intel.com>
>
> This patch adds missing braces around the 10gig link check to include the check for KR support.
>
> Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
> Reported-by: Sascha Wildner <saw@online.de>
> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] ixgbe: add missing braces
2012-08-10 17:35 [PATCH 1/1] ixgbe: add missing braces Peter P Waskiewicz Jr
2012-08-10 23:51 ` David Miller
@ 2012-08-11 0:34 ` Joe Perches
1 sibling, 0 replies; 3+ messages in thread
From: Joe Perches @ 2012-08-11 0:34 UTC (permalink / raw)
To: Peter P Waskiewicz Jr; +Cc: davem, Emil Tantilov, netdev, gospo, sassmann
On Fri, 2012-08-10 at 10:35 -0700, Peter P Waskiewicz Jr wrote:
> From: Emil Tantilov <emil.s.tantilov@intel.com>
[]
> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
[]
> @@ -804,12 +804,13 @@ static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
> link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII) {
> /* Set KX4/KX/KR support according to speed requested */
> autoc &= ~(IXGBE_AUTOC_KX4_KX_SUPP_MASK | IXGBE_AUTOC_KR_SUPP);
> - if (speed & IXGBE_LINK_SPEED_10GB_FULL)
> + if (speed & IXGBE_LINK_SPEED_10GB_FULL) {
> if (orig_autoc & IXGBE_AUTOC_KX4_SUPP)
> autoc |= IXGBE_AUTOC_KX4_SUPP;
> if ((orig_autoc & IXGBE_AUTOC_KR_SUPP) &&
> (hw->phy.smart_speed_active == false))
trivial and unrelated:
Testing booleans against true|false is not good style.
"value == false" is better written as "!value", etc...
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-08-11 0:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-10 17:35 [PATCH 1/1] ixgbe: add missing braces Peter P Waskiewicz Jr
2012-08-10 23:51 ` David Miller
2012-08-11 0:34 ` Joe Perches
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).