Import some changes from FreeBSD (details later, this is quick-n-dirty for now).

@@ -1,8 +1,8 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2012, Intel Corporation 
+  Copyright (c) 2001-2013, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
   modification, are permitted provided that the following conditions are met:
   

@@ -89,11 +89,10 @@
 {
         s32 ret_val = IXGBE_SUCCESS;
 
         DEBUGFUNC("ixgbe_set_mac_type\n");
 
-        if (hw->vendor_id == IXGBE_INTEL_VENDOR_ID) {
                 switch (hw->device_id) {
                 case IXGBE_DEV_ID_82598:
                 case IXGBE_DEV_ID_82598_BX:
                 case IXGBE_DEV_ID_82598AF_SINGLE_PORT:
                 case IXGBE_DEV_ID_82598AF_DUAL_PORT:

@@ -115,32 +114,33 @@
                 case IXGBE_DEV_ID_82599_SFP:
                 case IXGBE_DEV_ID_82599_BACKPLANE_FCOE:
                 case IXGBE_DEV_ID_82599_SFP_FCOE:
                 case IXGBE_DEV_ID_82599_SFP_EM:
                 case IXGBE_DEV_ID_82599_SFP_SF2:
+        case IXGBE_DEV_ID_82599_SFP_SF_QP:
                 case IXGBE_DEV_ID_82599EN_SFP:
                 case IXGBE_DEV_ID_82599_CX4:
+        case IXGBE_DEV_ID_82599_BYPASS:
                 case IXGBE_DEV_ID_82599_T3_LOM:
                         hw->mac.type = ixgbe_mac_82599EB;
                         break;
                 case IXGBE_DEV_ID_82599_VF:
+        case IXGBE_DEV_ID_82599_VF_HV:
                         hw->mac.type = ixgbe_mac_82599_vf;
                         break;
                 case IXGBE_DEV_ID_X540_VF:
+        case IXGBE_DEV_ID_X540_VF_HV:
                         hw->mac.type = ixgbe_mac_X540_vf;
                         break;
                 case IXGBE_DEV_ID_X540T:
-                case IXGBE_DEV_ID_X540T1:
+        case IXGBE_DEV_ID_X540_BYPASS:
                         hw->mac.type = ixgbe_mac_X540;
                         break;
                 default:
                         ret_val = IXGBE_ERR_DEVICE_NOT_SUPPORTED;
                         break;
                 }
-        } else {
-                ret_val = IXGBE_ERR_DEVICE_NOT_SUPPORTED;
-        }
 
         DEBUGOUT2("ixgbe_set_mac_type found mac: %d, returns: %d\n",
                   hw->mac.type, ret_val);
         return ret_val;
 }

@@ -520,20 +520,18 @@
 
 /**
  *  ixgbe_setup_phy_link_speed - Set auto advertise
  *  @hw: pointer to hardware structure
  *  @speed: new link speed
- *  @autoneg: TRUE if autonegotiation enabled
  *
  *  Sets the auto advertised capabilities
  **/
 s32 ixgbe_setup_phy_link_speed(struct ixgbe_hw *hw, ixgbe_link_speed speed,
-                               bool autoneg,
                                bool autoneg_wait_to_complete)
 {
         return ixgbe_call_func(hw, hw->phy.ops.setup_link_speed, (hw, speed,
-                               autoneg, autoneg_wait_to_complete),
+                               autoneg_wait_to_complete),
                                IXGBE_NOT_IMPLEMENTED);
 }
 
 /**
  *  ixgbe_check_link - Get link and speed status

@@ -589,21 +587,19 @@
 
 /**
  *  ixgbe_setup_link - Set link speed
  *  @hw: pointer to hardware structure
  *  @speed: new link speed
- *  @autoneg: TRUE if autonegotiation enabled
  *
  *  Configures link settings.  Restarts the link.
  *  Performs autonegotiation if needed.
  **/
 s32 ixgbe_setup_link(struct ixgbe_hw *hw, ixgbe_link_speed speed,
-                     bool autoneg,
                      bool autoneg_wait_to_complete)
 {
         return ixgbe_call_func(hw, hw->mac.ops.setup_link, (hw, speed,
-                               autoneg, autoneg_wait_to_complete),
+                               autoneg_wait_to_complete),
                                IXGBE_NOT_IMPLEMENTED);
 }
 
 /**
  *  ixgbe_get_link_capabilities - Returns link capabilities