Project

General

Profile

Bug #3443

Missing curly-braces in one ixgbe file.

Added by Dan McDonald about 7 years ago. Updated almost 7 years ago.

Status:
Resolved
Priority:
Normal
Assignee:
Category:
kernel
Start date:
2013-01-02
Due date:
% Done:

100%

Estimated time:
Difficulty:
Bite-size
Tags:

Description

This is an upstream fix from FreeBSD (which presumably comes from Intel). The 82599 support is missing a set of curly braces:

diff -r c4a7a8753bd2 -r a5034665bea2 usr/src/uts/common/io/ixgbe/ixgbe_82599.c
--- a/usr/src/uts/common/io/ixgbe/ixgbe_82599.c    Thu Dec 20 19:08:57 2012 -0500
+++ b/usr/src/uts/common/io/ixgbe/ixgbe_82599.c    Fri Dec 21 13:24:04 2012 -0500
@@ -867,12 +867,13 @@ s32 ixgbe_setup_mac_link_82599(struct ix
         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) &&

History

#1

Updated by Rich Lowe almost 7 years ago

  • Tags deleted (needs-triage)
  • % Done changed from 0 to 100
  • Status changed from New to Resolved
  • Category set to kernel

Resolved in b44bad0

Also available in: Atom PDF