Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53e0b080 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'intel-next' 



Aaron Brown says:

====================
Intel Wired LAN Driver Updates

This series contains updates to ixgbe, igb and documentation.  The
first four have been sent up as part of other series where 1 or more
in the series were rejected and either dropped or still being worked
on for reasons unrelated to these patches.

Don makes recovery from a HW ECC error just schedule a reset as it turns
out the previous behaviour of forcing the user to reload is not necessary.
Mark adds WoL support to port 0 of a new device.  Jacob removes a magic
number from the ptp_caps.name and updates the SubmittingPatches
documentation with details on the Fixed: tag.  And Carolyn updates igb
files to remove the FSF physical mail address.

[ DaveM Note: SubmittingPatches change omitted, will go via LKML ]
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0b95227a 74cfb2e1

drivers/net/ethernet/intel/igb/Makefile

+2 −3
Original line number Diff line number Diff line 
################################################################################

#

# Intel 82575 PCI-Express Ethernet Linux driver

# Copyright(c) 1999 - 2013 Intel Corporation.

# Copyright(c) 1999 - 2014 Intel Corporation.

#

# This program is free software; you can redistribute it and/or modify it

# under the terms and conditions of the GNU General Public License,
@@ -13,8 +13,7 @@ 
# more details.

#

# You should have received a copy of the GNU General Public License along with

# this program; if not, write to the Free Software Foundation, Inc.,

# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.

# this program; if not, see <http://www.gnu.org/licenses/>.

#

# The full GNU General Public License is included in this distribution in

# the file called "COPYING".

drivers/net/ethernet/intel/igb/e1000_82575.c

+4 −5
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel(R) Gigabit Ethernet Linux driver

  Copyright(c) 2007-2013 Intel Corporation.

  Copyright(c) 2007-2014 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -13,8 +13,7 @@ 
  more details.



  You should have received a copy of the GNU General Public License along with

  this program; if not, write to the Free Software Foundation, Inc.,

  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.

  this program; if not, see <http://www.gnu.org/licenses/>.



  The full GNU General Public License is included in this distribution in

  the file called "COPYING".
@@ -2720,7 +2719,7 @@ static const u8 e1000_emc_therm_limit[4] = { 
 *

 *  Updates the temperatures in mac.thermal_sensor_data

 **/

s32 igb_get_thermal_sensor_data_generic(struct e1000_hw *hw)

static s32 igb_get_thermal_sensor_data_generic(struct e1000_hw *hw)

{

	s32 status = E1000_SUCCESS;

	u16 ets_offset;
@@ -2774,7 +2773,7 @@ s32 igb_get_thermal_sensor_data_generic(struct e1000_hw *hw) 
 *  Sets the thermal sensor thresholds according to the NVM map

 *  and save off the threshold and location values into mac.thermal_sensor_data

 **/

s32 igb_init_thermal_sensor_thresh_generic(struct e1000_hw *hw)

static s32 igb_init_thermal_sensor_thresh_generic(struct e1000_hw *hw)

{

	s32 status = E1000_SUCCESS;

	u16 ets_offset;

drivers/net/ethernet/intel/igb/e1000_82575.h

+2 −5
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel(R) Gigabit Ethernet Linux driver

  Copyright(c) 2007-2013 Intel Corporation.

  Copyright(c) 2007-2014 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -13,8 +13,7 @@ 
  more details.



  You should have received a copy of the GNU General Public License along with

  this program; if not, write to the Free Software Foundation, Inc.,

  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.

  this program; if not, see <http://www.gnu.org/licenses/>.



  The full GNU General Public License is included in this distribution in

  the file called "COPYING".
@@ -266,8 +265,6 @@ u16 igb_rxpbs_adjust_82580(u32 data); 
s32 igb_read_emi_reg(struct e1000_hw *, u16 addr, u16 *data);

s32 igb_set_eee_i350(struct e1000_hw *);

s32 igb_set_eee_i354(struct e1000_hw *);

s32 igb_init_thermal_sensor_thresh_generic(struct e1000_hw *);

s32 igb_get_thermal_sensor_data_generic(struct e1000_hw *hw);



#define E1000_I2C_THERMAL_SENSOR_ADDR	0xF8

#define E1000_EMC_INTERNAL_DATA		0x00

drivers/net/ethernet/intel/igb/e1000_defines.h

+2 −3
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel(R) Gigabit Ethernet Linux driver

  Copyright(c) 2007-2013 Intel Corporation.

  Copyright(c) 2007-2014 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -13,8 +13,7 @@ 
  more details.



  You should have received a copy of the GNU General Public License along with

  this program; if not, write to the Free Software Foundation, Inc.,

  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.

  this program; if not, see <http://www.gnu.org/licenses/>.



  The full GNU General Public License is included in this distribution in

  the file called "COPYING".

drivers/net/ethernet/intel/igb/e1000_hw.h

+2 −3
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel(R) Gigabit Ethernet Linux driver

  Copyright(c) 2007-2013 Intel Corporation.

  Copyright(c) 2007-2014 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -13,8 +13,7 @@ 
  more details.



  You should have received a copy of the GNU General Public License along with

  this program; if not, write to the Free Software Foundation, Inc.,

  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.

  this program; if not, see <http://www.gnu.org/licenses/>.



  The full GNU General Public License is included in this distribution in

  the file called "COPYING".