Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

43096597 · Linus Torvalds <[email protected]> · 2008-10-14 10:28:49 -07:00

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  qlge: Fix page size ifdef test.
  net: Rationalise email address: Network Specific Parts
  dsa: fix compile bug on s390
  netns: mib6 section fixlet
  enic: Fix Kconfig headline description
  de2104x: wrong MAC address fix
  s390: claw compile fixlet
  net: export genphy_restart_aneg
  cxgb3: extend copyrights to 2008
  cxgb3: update driver version
  net/phy: add missing kernel-doc
  pktgen: fix skb leak in case of failure
  mISDN/dsp_cmx.c: fix size checks
  misdn: use nonseekable_open()
  net: fix driver build errors due to missing net/ip6_checksum.h include

Commit: 43096597a4cc4bd3f912be8a69dbd12e27e08038
Parents: 79aa79ba · 48501371

Merge commit. Changes below are compared with the first parent: 79aa79ba.

Changes

71 files changed · +87 −77

File	Status	Add	Del	Content
drivers/isdn/mISDN/dsp_cmx.c	modified	+2	−2	View file
drivers/isdn/mISDN/timerdev.c	modified	+1	−1	View file
drivers/net/3c501.c	modified	+6	−6	View file
drivers/net/3c515.c	modified	+1	−1	View file
drivers/net/Kconfig	modified	+1	−1	View file
drivers/net/appletalk/cops.c	modified	+1	−1	View file
drivers/net/cxgb3/adapter.h	modified	+1	−1	View file
drivers/net/cxgb3/ael1002.c	modified	+1	−1	View file
drivers/net/cxgb3/common.h	modified	+1	−1	View file
drivers/net/cxgb3/cxgb3_ctl_defs.h	modified	+1	−1	View file
drivers/net/cxgb3/cxgb3_defs.h	modified	+1	−1	View file
drivers/net/cxgb3/cxgb3_ioctl.h	modified	+1	−1	View file
drivers/net/cxgb3/cxgb3_main.c	modified	+1	−1	View file
drivers/net/cxgb3/cxgb3_offload.c	modified	+1	−1	View file
drivers/net/cxgb3/cxgb3_offload.h	modified	+1	−1	View file
drivers/net/cxgb3/firmware_exports.h	modified	+1	−1	View file
drivers/net/cxgb3/l2t.c	modified	+1	−1	View file
drivers/net/cxgb3/l2t.h	modified	+1	−1	View file
drivers/net/cxgb3/mc5.c	modified	+1	−1	View file
drivers/net/cxgb3/sge.c	modified	+1	−1	View file
drivers/net/cxgb3/t3_cpl.h	modified	+1	−1	View file
drivers/net/cxgb3/t3_hw.c	modified	+1	−1	View file
drivers/net/cxgb3/t3cdev.h	modified	+1	−1	View file
drivers/net/cxgb3/version.h	modified	+2	−2	View file
drivers/net/cxgb3/vsc8211.c	modified	+1	−1	View file
drivers/net/cxgb3/xgmac.c	modified	+1	−1	View file
drivers/net/eexpress.c	modified	+1	−1	View file
drivers/net/enic/enic_main.c	modified	+1	−0	View file
drivers/net/ibmlana.c	modified	+1	−1	View file
drivers/net/jme.c	modified	+1	−0	View file
drivers/net/macmace.c	modified	+1	−1	View file
drivers/net/pcmcia/3c589_cs.c	modified	+1	−1	View file
drivers/net/pcmcia/nmclan_cs.c	modified	+1	−1	View file
drivers/net/phy/mdio_bus.c	modified	+1	−0	View file
drivers/net/phy/phy_device.c	modified	+1	−0	View file
drivers/net/qlge/qlge.h	modified	+1	−1	View file
drivers/net/qlge/qlge_main.c	modified	+1	−0	View file
drivers/net/tlan.c	modified	+2	−1	View file
drivers/net/tokenring/smctr.c	modified	+1	−1	View file
drivers/net/tulip/de2104x.c	modified	+1	−0	View file
drivers/net/tulip/dmfe.c	modified	+2	−2	View file
drivers/net/via-velocity.c	modified	+1	−1	View file
drivers/net/wan/z85230.c	modified	+2	−1	View file
drivers/net/wan/z85230.h	modified	+1	−1	View file
drivers/net/wireless/wavelan.c	modified	+1	−1	View file
drivers/net/wireless/wavelan.p.h	modified	+1	−1	View file
drivers/s390/net/claw.c	modified	+1	−1	View file
include/linux/if_ether.h	modified	+1	−1	View file
include/linux/if_fddi.h	modified	+1	−1	View file
include/linux/if_hippi.h	modified	+1	−1	View file
include/linux/igmp.h	modified	+1	−1	View file
include/linux/netdevice.h	modified	+1	−1	View file
net/802/psnap.c	modified	+1	−1	View file
net/appletalk/ddp.c	modified	+2	−2	View file
net/core/datagram.c	modified	+1	−1	View file
net/core/dev_mcast.c	modified	+1	−1	View file
net/core/pktgen.c	modified	+5	−3	View file
net/core/skbuff.c	modified	+1	−1	View file
net/core/stream.c	modified	+1	−1	View file
net/dsa/Kconfig	modified	+1	−1	View file
net/ipv4/icmp.c	modified	+1	−1	View file
net/ipv4/igmp.c	modified	+1	−1	View file
net/ipv4/ip_fragment.c	modified	+1	−1	View file
net/ipv4/ip_input.c	modified	+1	−1	View file
net/ipv4/ipip.c	modified	+1	−1	View file
net/ipv4/ipmr.c	modified	+1	−1	View file
net/ipv4/udp.c	modified	+1	−1	View file
net/ipv6/af_inet6.c	modified	+1	−1	View file
net/netlink/af_netlink.c	modified	+1	−1	View file
net/sunrpc/xprtsock.c	modified	+2	−2	View file
net/unix/af_unix.c	modified	+1	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

drivers/isdn/mISDN/dsp_cmx.c

View file

diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
index e92b1ba..c2f51cc 100644
--- a/drivers/isdn/mISDN/dsp_cmx.c
+++ b/drivers/isdn/mISDN/dsp_cmx.c
@@ -452,10 +452,10 @@ one_member:
 			if (finddsp->features.pcm_id == dsp->features.pcm_id) {
 				if (finddsp->pcm_slot_rx >= 0 &&
 				    finddsp->pcm_slot_rx < sizeof(freeslots))
-					freeslots[finddsp->pcm_slot_tx] = 0;
+					freeslots[finddsp->pcm_slot_rx] = 0;
 				if (finddsp->pcm_slot_tx >= 0 &&
 				    finddsp->pcm_slot_tx < sizeof(freeslots))
-					freeslots[finddsp->pcm_slot_rx] = 0;
+					freeslots[finddsp->pcm_slot_tx] = 0;
 			}
 		}
 		i = 0;

drivers/isdn/mISDN/timerdev.c

View file

diff --git a/drivers/isdn/mISDN/timerdev.c b/drivers/isdn/mISDN/timerdev.c
index e746292..875fabe 100644
--- a/drivers/isdn/mISDN/timerdev.c
+++ b/drivers/isdn/mISDN/timerdev.c
@@ -61,7 +61,7 @@ mISDN_open(struct inode *ino, struct file *filep)
 	init_waitqueue_head(&dev->wait);
 	filep->private_data = dev;
 	__module_get(THIS_MODULE);
-	return 0;
+	return nonseekable_open(ino, filep);
 }
 
 static int

drivers/net/3c501.c

View file

diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c
index 5ba4bab..7d15e7c 100644
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
@@ -17,7 +17,7 @@
 	Annapolis MD 21403
 
     Fixed (again!) the missing interrupt locking on TX/RX shifting.
-	Alan Cox <[email protected]>
+	Alan Cox <[email protected]>
 
     Removed calls to init_etherdev since they are no longer needed, and
     cleaned up modularization just a bit. The driver still allows only
@@ -29,16 +29,16 @@
     the board. Now getting 150K/second FTP with a 3c501 card. Still playing
     with a TX-TX optimisation to see if we can touch 180-200K/second as seems
     theoretically maximum.
-		19950402 Alan Cox <[email protected]>
+		19950402 Alan Cox <[email protected]>
 
     Cleaned up for 2.3.x because we broke SMP now.
-		20000208 Alan Cox <[email protected]>
+		20000208 Alan Cox <[email protected]>
 
     Check up pass for 2.5. Nothing significant changed
-		20021009 Alan Cox <[email protected]>
+		20021009 Alan Cox <[email protected]>
 
     Fixed zero fill corner case
-		20030104 Alan Cox <[email protected]>
+		20030104 Alan Cox <[email protected]>
 
 
    For the avoidance of doubt the "preferred form" of this code is one which
@@ -104,7 +104,7 @@
 
 
 static const char version[] =
-	DRV_NAME ".c: " DRV_VERSION " Alan Cox ([email protected]).\n";
+	DRV_NAME ".c: " DRV_VERSION " Alan Cox ([email protected]).\n";
 
 /*
  *	Braindamage remaining:

drivers/net/3c515.c

View file

diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index e4e3241..a0f8b6e 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -18,7 +18,7 @@
 
 	2001/11/17 - Added ethtool support (jgarzik)
 
-	2002/10/28 - Locking updates for 2.5 ([email protected])
+	2002/10/28 - Locking updates for 2.5 ([email protected])
 
 */
 

drivers/net/Kconfig

View file

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e9d5294..1d8af33 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2400,7 +2400,7 @@ config EHEA
 	  will be called ehea.
 
 config ENIC
-	tristate "E, the Cisco 10G Ethernet NIC"
+	tristate "Cisco 10G Ethernet NIC support"
 	depends on PCI && INET
 	select INET_LRO
 	help

drivers/net/appletalk/cops.c

View file

diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index a0b4c85..735fc94 100644
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -4,7 +4,7 @@
  *      - Jay Schulist <[email protected]>
  *
  *	With more than a little help from;
- *	- Alan Cox <[email protected]> 
+ *	- Alan Cox <[email protected]>
  *
  *      Derived from:
  *      - skeleton.c: A network driver outline for linux.

drivers/net/cxgb3/adapter.h

View file

diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h
index 455ef52..bc8e241 100644
--- a/drivers/net/cxgb3/adapter.h
+++ b/drivers/net/cxgb3/adapter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

drivers/net/cxgb3/ael1002.c

View file

diff --git a/drivers/net/cxgb3/ael1002.c b/drivers/net/cxgb3/ael1002.c
index 744fac0..5c3c05d 100644
--- a/drivers/net/cxgb3/ael1002.c
+++ b/drivers/net/cxgb3/ael1002.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

drivers/net/cxgb3/common.h

View file

diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h
index 593fb64..e312d31 100644
--- a/drivers/net/cxgb3/common.h
+++ b/drivers/net/cxgb3/common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

drivers/net/cxgb3/cxgb3_ctl_defs.h

View file

diff --git a/drivers/net/cxgb3/cxgb3_ctl_defs.h b/drivers/net/cxgb3/cxgb3_ctl_defs.h
index 6ad9240..1d8d46e 100644
--- a/drivers/net/cxgb3/cxgb3_ctl_defs.h
+++ b/drivers/net/cxgb3/cxgb3_ctl_defs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

drivers/net/cxgb3/cxgb3_defs.h

View file

diff --git a/drivers/net/cxgb3/cxgb3_defs.h b/drivers/net/cxgb3/cxgb3_defs.h
index 45e9216..47e5376 100644
--- a/drivers/net/cxgb3/cxgb3_defs.h
+++ b/drivers/net/cxgb3/cxgb3_defs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2006-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

drivers/net/cxgb3/cxgb3_ioctl.h

View file

diff --git a/drivers/net/cxgb3/cxgb3_ioctl.h b/drivers/net/cxgb3/cxgb3_ioctl.h
index 3e8d5fa..b19e437 100644
--- a/drivers/net/cxgb3/cxgb3_ioctl.h
+++ b/drivers/net/cxgb3/cxgb3_ioctl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

drivers/net/cxgb3/cxgb3_main.c

View file

diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index f31985d..1ace41a 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

drivers/net/cxgb3/cxgb3_offload.c

View file

diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c
index 0f6fd63..265aa8a 100644
--- a/drivers/net/cxgb3/cxgb3_offload.c
+++ b/drivers/net/cxgb3/cxgb3_offload.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2006-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

drivers/net/cxgb3/cxgb3_offload.h

View file

diff --git a/drivers/net/cxgb3/cxgb3_offload.h b/drivers/net/cxgb3/cxgb3_offload.h
index 7a37913..d514e50 100644
--- a/drivers/net/cxgb3/cxgb3_offload.h
+++ b/drivers/net/cxgb3/cxgb3_offload.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2006-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

drivers/net/cxgb3/firmware_exports.h

View file

diff --git a/drivers/net/cxgb3/firmware_exports.h b/drivers/net/cxgb3/firmware_exports.h
index b75ddd8..0d9b0e6 100644
--- a/drivers/net/cxgb3/firmware_exports.h
+++ b/drivers/net/cxgb3/firmware_exports.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2004-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

drivers/net/cxgb3/l2t.c

View file

diff --git a/drivers/net/cxgb3/l2t.c b/drivers/net/cxgb3/l2t.c
index b2c5314..4407ac9 100644
--- a/drivers/net/cxgb3/l2t.c
+++ b/drivers/net/cxgb3/l2t.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

drivers/net/cxgb3/l2t.h

View file

diff --git a/drivers/net/cxgb3/l2t.h b/drivers/net/cxgb3/l2t.h
index 42ce65f..fd3eb07 100644
--- a/drivers/net/cxgb3/l2t.h
+++ b/drivers/net/cxgb3/l2t.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

drivers/net/cxgb3/mc5.c

View file

diff --git a/drivers/net/cxgb3/mc5.c b/drivers/net/cxgb3/mc5.c
index 4c4d6e8..3b5517b 100644
--- a/drivers/net/cxgb3/mc5.c
+++ b/drivers/net/cxgb3/mc5.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

drivers/net/cxgb3/sge.c

View file

diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index 8791941..c6480be 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

drivers/net/cxgb3/t3_cpl.h

View file

diff --git a/drivers/net/cxgb3/t3_cpl.h b/drivers/net/cxgb3/t3_cpl.h
index 917970e..852c399 100644
--- a/drivers/net/cxgb3/t3_cpl.h
+++ b/drivers/net/cxgb3/t3_cpl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2004-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

drivers/net/cxgb3/t3_hw.c

View file

diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index 4da5b09..968f64b 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

drivers/net/cxgb3/t3cdev.h

View file

diff --git a/drivers/net/cxgb3/t3cdev.h b/drivers/net/cxgb3/t3cdev.h
index 0a21cfb..be55e9a 100644
--- a/drivers/net/cxgb3/t3cdev.h
+++ b/drivers/net/cxgb3/t3cdev.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2007 Chelsio Communications.  All rights reserved.
+ * Copyright (C) 2006-2008 Chelsio Communications.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

drivers/net/cxgb3/version.h

View file

diff --git a/drivers/net/cxgb3/version.h b/drivers/net/cxgb3/version.h
index 29db711..bb8698a 100644
--- a/drivers/net/cxgb3/version.h
+++ b/drivers/net/cxgb3/version.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -35,7 +35,7 @@
 #define DRV_DESC "Chelsio T3 Network Driver"
 #define DRV_NAME "cxgb3"
 /* Driver version */
-#define DRV_VERSION "1.0-ko"
+#define DRV_VERSION "1.1.0-ko"
 
 /* Firmware version */
 #define FW_VERSION_MAJOR 7

drivers/net/cxgb3/vsc8211.c

View file

diff --git a/drivers/net/cxgb3/vsc8211.c b/drivers/net/cxgb3/vsc8211.c
index 306c2dc..33f956b 100644
--- a/drivers/net/cxgb3/vsc8211.c
+++ b/drivers/net/cxgb3/vsc8211.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

drivers/net/cxgb3/xgmac.c

View file

diff --git a/drivers/net/cxgb3/xgmac.c b/drivers/net/cxgb3/xgmac.c
index ffdc0a1..9d77869 100644
--- a/drivers/net/cxgb3/xgmac.c
+++ b/drivers/net/cxgb3/xgmac.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.
+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU

drivers/net/eexpress.c

View file

diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 795c594..b751c1b 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -8,7 +8,7 @@
  *
  * Many modifications, and currently maintained, by
  *  Philip Blundell <[email protected]>
- * Added the Compaq LTE  Alan Cox <[email protected]>
+ * Added the Compaq LTE  Alan Cox <[email protected]>
  * Added MCA support Adam Fritzler
  *
  * Note - this driver is experimental still - it has problems on faster

drivers/net/enic/enic_main.c

View file

diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index f3a47a8..180e968 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -34,6 +34,7 @@
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/tcp.h>
+#include <net/ip6_checksum.h>
 
 #include "cq_enet_desc.h"
 #include "vnic_dev.h"

drivers/net/ibmlana.c

View file

diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c
index 95e3464..f027647 100644
--- a/drivers/net/ibmlana.c
+++ b/drivers/net/ibmlana.c
@@ -71,7 +71,7 @@ History:
   June 1st, 2000
 	corrected version codes, added support for the latest 2.3 changes
   Oct 28th, 2002
-  	cleaned up for the 2.5 tree <[email protected]>
+	cleaned up for the 2.5 tree <[email protected]>
 
  *************************************************************************/
 

drivers/net/jme.c

View file

diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index 156f159..81c6cdc 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -37,6 +37,7 @@
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/if_vlan.h>
+#include <net/ip6_checksum.h>
 #include "jme.h"
 
 static int force_pseudohp = -1;

drivers/net/macmace.c

View file

diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c
index 51ad376..85587a6 100644
--- a/drivers/net/macmace.c
+++ b/drivers/net/macmace.c
@@ -9,7 +9,7 @@
  *	2 of the License, or (at your option) any later version.
  *
  *	Copyright (C) 1996 Paul Mackerras.
- *	Copyright (C) 1998 Alan Cox <[email protected]>
+ *	Copyright (C) 1998 Alan Cox <[email protected]>
  *
  *	Modified heavily by Joshua M. Thompson based on Dave Huang's NetBSD driver
  *

drivers/net/pcmcia/3c589_cs.c

View file

diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 0b28d0d..c235cdb 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -15,7 +15,7 @@
     incorporated herein by reference.
     Donald Becker may be reached at [email protected]
     
-    Updated for 2.5.x by Alan Cox <[email protected]>
+    Updated for 2.5.x by Alan Cox <[email protected]>
 
 ======================================================================*/
 

drivers/net/pcmcia/nmclan_cs.c

View file

diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index 54df34f..448cd40 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -69,7 +69,7 @@ Driver Notes and Issues
 History
 -------------------------------------------------------------------------------
 Log: nmclan_cs.c,v
- * 2.5.75-ac1 2003/07/11 Alan Cox <[email protected]>
+ * 2.5.75-ac1 2003/07/11 Alan Cox <[email protected]>
  * Fixed hang on card eject as we probe it
  * Cleaned up to use new style locking.
  *

drivers/net/phy/mdio_bus.c

View file

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 6671e2d..d0ed1ef 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -55,6 +55,7 @@ EXPORT_SYMBOL(mdiobus_alloc);
 
 /**
  * mdiobus_release - mii_bus device release callback
+ * @d: the target struct device that contains the mii_bus
  *
  * Description: called when the last reference to an mii_bus is
  * dropped, to free the underlying memory.

drivers/net/phy/phy_device.c

View file

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 1716274..f11e900 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -557,6 +557,7 @@ int genphy_restart_aneg(struct phy_device *phydev)
 
 	return ctl;
 }
+EXPORT_SYMBOL(genphy_restart_aneg);
 
 
 /**

drivers/net/qlge/qlge.h

View file

diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h
index c37ea43..38116f9 100644
--- a/drivers/net/qlge/qlge.h
+++ b/drivers/net/qlge/qlge.h
@@ -58,7 +58,7 @@
  */
 #if (PAGE_SHIFT == 12) || (PAGE_SHIFT == 13)	/* 4k & 8k pages */
 #define TX_DESC_PER_OAL ((MAX_SKB_FRAGS - TX_DESC_PER_IOCB) + 2)
-#elif (PAGE_SHIFT == 16)	/* 64k pages */
+#else /* all other page sizes */
 #define TX_DESC_PER_OAL 0
 #endif
 

drivers/net/qlge/qlge_main.c

View file

diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 297877b..4b2caa6 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -39,6 +39,7 @@
 #include <linux/delay.h>
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
+#include <net/ip6_checksum.h>
 
 #include "qlge.h"
 

drivers/net/tlan.c

View file

diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index ec871f6..c41d687 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -29,7 +29,8 @@
  *
  *	Tigran Aivazian <[email protected]>:	TLan_PciProbe() now uses
  *						new PCI BIOS interface.
- *	Alan Cox	<[email protected]>:	Fixed the out of memory
+ *	Alan Cox	<[email protected]>:
+ *						Fixed the out of memory
  *						handling.
  *
  *	Torben Mathiasen <[email protected]> New Maintainer!

drivers/net/tokenring/smctr.c

View file

diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index fa73e6e..ed50d28 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -25,7 +25,7 @@
  *  To do:
  *    1. Multicast support.
  *
- *  Initial 2.5 cleanup Alan Cox <[email protected]>  2002/10/28
+ *  Initial 2.5 cleanup Alan Cox <[email protected]>  2002/10/28
  */
 
 #include <linux/module.h>

drivers/net/tulip/de2104x.c

View file

diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index f54c450..124d5d6 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -1688,6 +1688,7 @@ static void __devinit de21040_get_mac_address (struct de_private *de)
 	unsigned i;
 
 	dw32 (ROMCmd, 0);	/* Reset the pointer with a dummy write. */
+	udelay(5);
 
 	for (i = 0; i < 6; i++) {
 		int value, boguscnt = 100000;

drivers/net/tulip/dmfe.c

View file

diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 6562004..8e46a51 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -23,7 +23,7 @@
     Marcelo Tosatti <[email protected]> :
     Made it compile in 2.3 (device to net_device)
 
-    Alan Cox <[email protected]> :
+    Alan Cox <[email protected]> :
     Cleaned up for kernel merge.
     Removed the back compatibility support
     Reformatted, fixing spelling etc as I went
@@ -49,7 +49,7 @@
     support.  Updated PCI resource allocation.  Do not
     forget to unmap PCI mapped skbs.
 
-    Alan Cox <[email protected]>
+    Alan Cox <[email protected]>
     Added new PCI identifiers provided by Clear Zhang at ALi
     for their 1563 ethernet device.
 

drivers/net/via-velocity.c

View file

diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index ad20f96..2dced38 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -12,7 +12,7 @@
  *	Scatter gather
  *	More testing
  *
- * The changes are (c) Copyright 2004, Red Hat Inc. <[email protected]>
+ * The changes are (c) Copyright 2004, Red Hat Inc. <[email protected]>
  * Additional fixes and clean up: Francois Romieu
  *
  * This source has not been verified for use in safety critical systems.

drivers/net/wan/z85230.c

View file

diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
index 243bd8d..ccd9cd3 100644
--- a/drivers/net/wan/z85230.c
+++ b/drivers/net/wan/z85230.c
@@ -18,7 +18,8 @@
  *	DMA now uses get_free_page as kmalloc buffers may span a 64K 
  *	boundary.
  *
- *	Modified for SMP safety and SMP locking by Alan Cox <[email protected]>
+ *	Modified for SMP safety and SMP locking by Alan Cox
+ *					<[email protected]>
  *
  *	Performance
  *

drivers/net/wan/z85230.h

View file

diff --git a/drivers/net/wan/z85230.h b/drivers/net/wan/z85230.h
index 4f37239..85b3e78 100644
--- a/drivers/net/wan/z85230.h
+++ b/drivers/net/wan/z85230.h
@@ -2,7 +2,7 @@
  *	Description of Z8530 Z85C30 and Z85230 communications chips
  *
  * Copyright (C) 1995 David S. Miller ([email protected])
- * Copyright (C) 1998 Alan Cox <[email protected]>
+ * Copyright (C) 1998 Alan Cox <[email protected]>
  */
 
 #ifndef _Z8530_H

drivers/net/wireless/wavelan.c

View file

diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c
index 136220b..e939a73 100644
--- a/drivers/net/wireless/wavelan.c
+++ b/drivers/net/wireless/wavelan.c
@@ -4387,7 +4387,7 @@ MODULE_LICENSE("GPL");
  *
  * Thanks go also to:
  *	James Ashton ([email protected]),
- *	Alan Cox ([email protected]),
+ *	Alan Cox ([email protected]),
  *	Allan Creighton ([email protected]),
  *	Matthew Geier ([email protected]),
  *	Remo di Giovanni ([email protected]),

drivers/net/wireless/wavelan.p.h

View file

diff --git a/drivers/net/wireless/wavelan.p.h b/drivers/net/wireless/wavelan.p.h
index b33ac47..44d31bb 100644
--- a/drivers/net/wireless/wavelan.p.h
+++ b/drivers/net/wireless/wavelan.p.h
@@ -186,7 +186,7 @@
  *
  * Thanks go also to:

This diff is incomplete. Download the complete patch.