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:
   

@@ -114,10 +114,11 @@
                                 &ixgbe_get_copper_link_capabilities_generic;
         mac->ops.setup_link = &ixgbe_setup_mac_link_X540;
         mac->ops.setup_rxpba = &ixgbe_set_rxpba_generic;
         mac->ops.check_link = &ixgbe_check_mac_link_generic;
 
+
         mac->mcft_size          = 128;
         mac->vft_size           = 128;
         mac->num_rar_entries    = 128;
         mac->rx_pb_size         = 384;
         mac->max_tx_queues      = 128;

@@ -173,20 +174,18 @@
 
 /**
  *  ixgbe_setup_mac_link_X540 - Sets the auto advertised capabilities
  *  @hw: pointer to hardware structure
  *  @speed: new link speed
- *  @autoneg: TRUE if autonegotiation enabled
  *  @autoneg_wait_to_complete: TRUE when waiting for completion is needed
  **/
 s32 ixgbe_setup_mac_link_X540(struct ixgbe_hw *hw,
-                              ixgbe_link_speed speed, bool autoneg,
+                              ixgbe_link_speed speed,
                               bool autoneg_wait_to_complete)
 {
         DEBUGFUNC("ixgbe_setup_mac_link_X540");
-        return hw->phy.ops.setup_link_speed(hw, speed, autoneg,
-                                            autoneg_wait_to_complete);
+        return hw->phy.ops.setup_link_speed(hw, speed, autoneg_wait_to_complete);
 }
 
 /**
  *  ixgbe_reset_hw_X540 - Perform hardware reset
  *  @hw: pointer to hardware structure

@@ -970,6 +969,7 @@
         IXGBE_WRITE_REG(hw, IXGBE_MACC, macc_reg);
         IXGBE_WRITE_FLUSH(hw);
 
         return IXGBE_SUCCESS;
 }
+