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

Commit 8fc65162 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch '7.0.38-k2' of git://66.93.40.222/srv/git/netdev-2.6

parents 2acab771 99a1f9e8

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -1395,6 +1395,8 @@ P: Jesse Brandeburg 
M:	jesse.brandeburg@intel.com

P:	Jeff Kirsher

M:	jeffrey.t.kirsher@intel.com

P:	Auke Kok

M:	auke-jan.h.kok@intel.com

W:	http://sourceforge.net/projects/e1000/

S:	Supported
@@ -1407,6 +1409,8 @@ P: Jesse Brandeburg 
M:	jesse.brandeburg@intel.com

P:	Jeff Kirsher

M:	jeffrey.t.kirsher@intel.com

P:	Auke Kok

M:	auke-jan.h.kok@intel.com

W:	http://sourceforge.net/projects/e1000/

S:	Supported
@@ -1419,6 +1423,8 @@ P: John Ronciak 
M:	john.ronciak@intel.com

P:	Jesse Brandeburg

M:	jesse.brandeburg@intel.com

P:	Auke Kok

M:	auke-jan.h.kok@intel.com

W:	http://sourceforge.net/projects/e1000/

S:	Supported

drivers/net/e1000/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
# 

# Contact Information:

# Linux NICS <linux.nics@intel.com>

# e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

# Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

#

################################################################################

drivers/net/e1000/e1000.h

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



  

  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.

  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.

  

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

  under the terms of the GNU General Public License as published by the Free
@@ -22,6 +22,7 @@ 
  

  Contact Information:

  Linux NICS <linux.nics@intel.com>

  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497



*******************************************************************************/
@@ -114,6 +115,8 @@ struct e1000_adapter; 
/* Supported Rx Buffer Sizes */

#define E1000_RXBUFFER_128   128    /* Used for packet split */

#define E1000_RXBUFFER_256   256    /* Used for packet split */

#define E1000_RXBUFFER_512   512

#define E1000_RXBUFFER_1024  1024

#define E1000_RXBUFFER_2048  2048

#define E1000_RXBUFFER_4096  4096

#define E1000_RXBUFFER_8192  8192
@@ -334,7 +337,6 @@ struct e1000_adapter { 
	boolean_t have_msi;

#endif

	/* to not mess up cache alignment, always add to the bottom */

	boolean_t txb2b;

#ifdef NETIF_F_TSO

	boolean_t tso_force;

#endif

drivers/net/e1000/e1000_ethtool.c

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



  

  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.

  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.

  

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

  under the terms of the GNU General Public License as published by the Free
@@ -22,6 +22,7 @@ 
  

  Contact Information:

  Linux NICS <linux.nics@intel.com>

  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497



*******************************************************************************/

drivers/net/e1000/e1000_hw.c

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



  

  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.

  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.

  

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

  under the terms of the GNU General Public License as published by the Free
@@ -22,6 +22,7 @@ 
  

  Contact Information:

  Linux NICS <linux.nics@intel.com>

  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497



*******************************************************************************/