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

* 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

drivers/isdn/mISDN/dsp_cmx.c

···
 			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

···
 	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

···
 	Annapolis MD 21403
 
     Fixed (again!) the missing interrupt locking on TX/RX shifting.
-	Alan Cox <[e-mail]>
+	Alan Cox <[e-mail]>
 
     Removed calls to init_etherdev since they are no longer needed, and
     cleaned up modularization just a bit. The driver still allows only
···
     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 <[e-mail]>
+		19950402 Alan Cox <[e-mail]>
 
     Cleaned up for 2.3.x because we broke SMP now.
-		20000208 Alan Cox <[e-mail]>
+		20000208 Alan Cox <[e-mail]>
 
     Check up pass for 2.5. Nothing significant changed
-		20021009 Alan Cox <[e-mail]>
+		20021009 Alan Cox <[e-mail]>
 
     Fixed zero fill corner case
-		20030104 Alan Cox <[e-mail]>
+		20030104 Alan Cox <[e-mail]>
 
 
    For the avoidance of doubt the "preferred form" of this code is one which
···
 
 
 static const char version[] =
-	DRV_NAME ".c: " DRV_VERSION " Alan Cox ([e-mail]).\n";
+	DRV_NAME ".c: " DRV_VERSION " Alan Cox ([e-mail]).\n";
 
 /*
  *	Braindamage remaining:

drivers/net/3c515.c

···
 
 	2001/11/17 - Added ethtool support (jgarzik)
 
-	2002/10/28 - Locking updates for 2.5 ([e-mail])
+	2002/10/28 - Locking updates for 2.5 ([e-mail])
 
 */
 

drivers/net/Kconfig

···
 	  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

···
  *      - Jay Schulist <[e-mail]>
  *
  *	With more than a little help from;
- *	- Alan Cox <[e-mail]> 
+ *	- Alan Cox <[e-mail]>
  *
  *      Derived from:
  *      - skeleton.c: A network driver outline for linux.

drivers/net/cxgb3/adapter.h

···
 /*
- * 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

···
 /*
- * 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

···
 /*
- * 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

···
 /*
- * 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

···
 /*
- * 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

···
 /*
- * 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

···
 /*
- * 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

···
 /*
- * 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

···
 /*
- * 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

···
 /*
- * 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

···
 /*
- * 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

···
 /*
- * 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

···
 /*
- * 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

···
 /*
- * 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

···
 /*
- * 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

···
 /*
- * 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

···
 /*
- * 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

···
 /*
- * 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
···
 #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

···
 /*
- * 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

···
 /*
- * 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

···
  *
  * Many modifications, and currently maintained, by
  *  Philip Blundell <[e-mail]>
- * Added the Compaq LTE  Alan Cox <[e-mail]>
+ * Added the Compaq LTE  Alan Cox <[e-mail]>
  * Added MCA support Adam Fritzler
  *
  * Note - this driver is experimental still - it has problems on faster

drivers/net/enic/enic_main.c

···
 #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

···
   June 1st, 2000
 	corrected version codes, added support for the latest 2.3 changes
   Oct 28th, 2002
-  	cleaned up for the 2.5 tree <[e-mail]>
+	cleaned up for the 2.5 tree <[e-mail]>
 
  *************************************************************************/
 

drivers/net/jme.c

···
 #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

···
  *	2 of the License, or (at your option) any later version.
  *
  *	Copyright (C) 1996 Paul Mackerras.
- *	Copyright (C) 1998 Alan Cox <[e-mail]>
+ *	Copyright (C) 1998 Alan Cox <[e-mail]>
  *
  *	Modified heavily by Joshua M. Thompson based on Dave Huang's NetBSD driver
  *

drivers/net/pcmcia/3c589_cs.c

···
     incorporated herein by reference.
     Donald Becker may be reached at [e-mail]
     
-    Updated for 2.5.x by Alan Cox <[e-mail]>
+    Updated for 2.5.x by Alan Cox <[e-mail]>
 
 ======================================================================*/
 

drivers/net/pcmcia/nmclan_cs.c

···
 History
 -------------------------------------------------------------------------------
 Log: nmclan_cs.c,v
- * 2.5.75-ac1 2003/07/11 Alan Cox <[e-mail]>
+ * 2.5.75-ac1 2003/07/11 Alan Cox <[e-mail]>
  * Fixed hang on card eject as we probe it
  * Cleaned up to use new style locking.
  *

drivers/net/phy/mdio_bus.c

···
 
 /**
  * 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

···
 
 	return ctl;
 }
+EXPORT_SYMBOL(genphy_restart_aneg);
 
 
 /**

drivers/net/qlge/qlge.h

···
  */
 #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

···
 #include <linux/delay.h>
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
+#include <net/ip6_checksum.h>
 
 #include "qlge.h"
 

drivers/net/tlan.c

···
  *
  *	Tigran Aivazian <[e-mail]>:	TLan_PciProbe() now uses
  *						new PCI BIOS interface.
- *	Alan Cox	<[e-mail]>:	Fixed the out of memory
+ *	Alan Cox	<[e-mail]>:
+ *						Fixed the out of memory
  *						handling.
  *
  *	Torben Mathiasen <[e-mail]> New Maintainer!

drivers/net/tokenring/smctr.c

···
  *  To do:
  *    1. Multicast support.
  *
- *  Initial 2.5 cleanup Alan Cox <[e-mail]>  2002/10/28
+ *  Initial 2.5 cleanup Alan Cox <[e-mail]>  2002/10/28
  */
 
 #include <linux/module.h>

drivers/net/tulip/de2104x.c

···
 	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

···
     Marcelo Tosatti <[e-mail]> :
     Made it compile in 2.3 (device to net_device)
 
-    Alan Cox <[e-mail]> :
+    Alan Cox <[e-mail]> :
     Cleaned up for kernel merge.
     Removed the back compatibility support
     Reformatted, fixing spelling etc as I went
···
     support.  Updated PCI resource allocation.  Do not
     forget to unmap PCI mapped skbs.
 
-    Alan Cox <[e-mail]>
+    Alan Cox <[e-mail]>
     Added new PCI identifiers provided by Clear Zhang at ALi
     for their 1563 ethernet device.
 

drivers/net/via-velocity.c

···
  *	Scatter gather
  *	More testing
  *
- * The changes are (c) Copyright 2004, Red Hat Inc. <[e-mail]>
+ * The changes are (c) Copyright 2004, Red Hat Inc. <[e-mail]>
  * Additional fixes and clean up: Francois Romieu
  *
  * This source has not been verified for use in safety critical systems.

drivers/net/wan/z85230.c

···
  *	DMA now uses get_free_page as kmalloc buffers may span a 64K 
  *	boundary.
  *
- *	Modified for SMP safety and SMP locking by Alan Cox <[e-mail]>
+ *	Modified for SMP safety and SMP locking by Alan Cox
+ *					<[e-mail]>
  *
  *	Performance
  *

drivers/net/wan/z85230.h

···
  *	Description of Z8530 Z85C30 and Z85230 communications chips
  *
  * Copyright (C) 1995 David S. Miller ([e-mail])
- * Copyright (C) 1998 Alan Cox <[e-mail]>
+ * Copyright (C) 1998 Alan Cox <[e-mail]>
  */
 
 #ifndef _Z8530_H

drivers/net/wireless/wavelan.c

···
  *
  * Thanks go also to:
  *	James Ashton ([e-mail]),
- *	Alan Cox ([e-mail]),
+ *	Alan Cox ([e-mail]),
  *	Allan Creighton ([e-mail]),
  *	Matthew Geier ([e-mail]),
  *	Remo di Giovanni ([e-mail]),

drivers/net/wireless/wavelan.p.h

···
  *
  * Thanks go also to:
  *	James Ashton <[e-mail]>,
- *	Alan Cox <[e-mail]>,
+ *	Alan Cox <[e-mail]>,
  *	Allan Creighton <[e-mail]>,
  *	Matthew Geier <[e-mail]>,
  *	Remo di Giovanni <[e-mail]>,

drivers/s390/net/claw.c

···
 	if (ret != 0) {
 		printk(KERN_WARNING
 			"claw: ccw_device_set_online %s WRITE failed "
-		       "with ret = %d\n", dev_name(&cgdev->cdev[WRITE]->dev)
+		       "with ret = %d\n", dev_name(&cgdev->cdev[WRITE]->dev),
 		       ret);
 		goto out;
 	}

include/linux/if_ether.h

···
  *
  * Author:	Fred N. van Kempen, <[e-mail]>
  *		Donald Becker, <[e-mail]>
- *		Alan Cox, <[e-mail]>
+ *		Alan Cox, <[e-mail]>
  *		Steve Whitehouse, <[e-mail]>
  *
  *		This program is free software; you can redistribute it and/or

include/linux/if_fddi.h

···
  *		if_fddi.h is based on previous if_ether.h and if_tr.h work by
  *			Fred N. van Kempen, <[e-mail]>
  *			Donald Becker, <[e-mail]>
- *			Alan Cox, <[e-mail]>
+ *			Alan Cox, <[e-mail]>
  *			Steve Whitehouse, <[e-mail]>
  *			Peter De Schrijver, <[e-mail]>
  *

include/linux/if_hippi.h

···
  *
  * Author:	Fred N. van Kempen, <[e-mail]>
  *		Donald Becker, <[e-mail]>
- *		Alan Cox, <[e-mail]>
+ *		Alan Cox, <[e-mail]>
  *		Steve Whitehouse, <[e-mail]>
  *		Jes Sorensen, <[e-mail]>
  *

include/linux/igmp.h

···
  *	Linux NET3:	Internet Group Management Protocol  [IGMP]
  *
  *	Authors:
- *		Alan Cox <[e-mail]>
+ *		Alan Cox <[e-mail]>
  *
  *	Extended to talk the BSD extended IGMP protocol of mrouted 3.6
  *

include/linux/netdevice.h

···
  *		Fred N. van Kempen, <[e-mail]>
  *		Corey Minyard <wf-rch![e-mail]>
  *		Donald J. Becker, <[e-mail]>
- *		Alan Cox, <[e-mail]>
+ *		Alan Cox, <[e-mail]>
  *		Bjorn Ekwall. <[e-mail]>
  *              Pekka Riikonen <[e-mail]>
  *

net/802/psnap.c

···
 /*
  *	SNAP data link layer. Derived from 802.2
  *
- *		Alan Cox <[e-mail]>,
+ *		Alan Cox <[e-mail]>,
  *		from the 802.2 layer by Greg Page.
  *		Merged in additions from Greg Page's psnap.c.
  *

net/appletalk/ddp.c

···
  *	DDP:	An implementation of the AppleTalk DDP protocol for
  *		Ethernet 'ELAP'.
  *
- *		Alan Cox  <[e-mail]>
+ *		Alan Cox  <[e-mail]>
  *
  *		With more than a little assistance from
  *
···
 module_exit(atalk_exit);
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Alan Cox <[e-mail]>");
+MODULE_AUTHOR("Alan Cox <[e-mail]>");
 MODULE_DESCRIPTION("AppleTalk 0.20\n");
 MODULE_ALIAS_NETPROTO(PF_APPLETALK);

net/core/datagram.c

···
  *	identical recvmsg() code. So we share it here. The poll was
  *	shared before but buried in udp.c so I moved it.
  *
- *	Authors:	Alan Cox <[e-mail]>. (datagram_poll() from old
+ *	Authors:	Alan Cox <[e-mail]>. (datagram_poll() from old
  *						     udp.c code)
  *
  *	Fixes:

net/core/dev_mcast.c

···
  *		Richard Underwood <[e-mail]>
  *
  *	Stir fried together from the IP multicast and CAP patches above
- *		Alan Cox <[e-mail]>
+ *		Alan Cox <[e-mail]>
  *
  *	Fixes:
  *		Alan Cox	:	Update the device on a real delete

net/core/pktgen.c

···
 				if (ret < 0) {
 					printk(KERN_ERR "Error expanding "
 					       "ipsec packet %d\n",ret);
-					return 0;
+					goto err;
 				}
 			}
 
···
 			if (ret) {
 				printk(KERN_ERR "Error creating ipsec "
 				       "packet %d\n",ret);
-				kfree_skb(skb);
-				return 0;
+				goto err;
 			}
 			/* restore ll */
 			eth = (__u8 *) skb_push(skb, ETH_HLEN);
···
 		}
 	}
 	return 1;
+err:
+	kfree_skb(skb);
+	return 0;
 }
 #endif
 

net/core/skbuff.c

···
 /*
  *	Routines having to do with the 'struct sk_buff' memory handlers.
  *
- *	Authors:	Alan Cox <[e-mail]>
+ *	Authors:	Alan Cox <[e-mail]>
  *			Florian La Roche <[e-mail]>
  *
  *	Fixes:

net/core/stream.c

···
  *
  *     Authors:        Arnaldo Carvalho de Melo <[e-mail]>
  *                     (from old tcp.c code)
- *                     Alan Cox <[e-mail]> (Borrowed comments 8-))
+ *                     Alan Cox <[e-mail]> (Borrowed comments 8-))
  */
 
 #include <linux/module.h>

net/dsa/Kconfig

···
 menuconfig NET_DSA
 	bool "Distributed Switch Architecture support"
 	default n
-	depends on EXPERIMENTAL
+	depends on EXPERIMENTAL && !S390
 	select PHYLIB
 	---help---
 	  This allows you to use hardware switch chips that use

net/ipv4/icmp.c

···
 /*
  *	NET3:	Implementation of the ICMP protocol layer.
  *
- *		Alan Cox, <[e-mail]>
+ *		Alan Cox, <[e-mail]>
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

net/ipv4/igmp.c

···
  *	seems to fall out with gcc 2.6.2.
  *
  *	Authors:
- *		Alan Cox <[e-mail]>
+ *		Alan Cox <[e-mail]>
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License

net/ipv4/ip_fragment.c

···
  *		The IP fragmentation functionality.
  *
  * Authors:	Fred N. van Kempen <[e-mail]>
- *		Alan Cox <[e-mail]>
+ *		Alan Cox <[e-mail]>
  *
  * Fixes:
  *		Alan Cox	:	Split from ip.c , see ip_input.c for history.

net/ipv4/ip_input.c

···
  * Authors:	Ross Biro
  *		Fred N. van Kempen, <[e-mail]>
  *		Donald Becker, <[e-mail]>
- *		Alan Cox, <[e-mail]>
+ *		Alan Cox, <[e-mail]>
  *		Richard Underwood
  *		Stefan Becker, <[e-mail]>
  *		Jorge Cwik, <[e-mail]>

net/ipv4/ipip.c

···
 		Made the tunnels use dev->name not tunnel: when error reporting.
 		Added tx_dropped stat
 
-		-Alan Cox	([e-mail]) 21 March 95
+		-Alan Cox	([e-mail]) 21 March 95
 
 	Reworked:
 		Changed to tunnel to destination gateway in addition to the

net/ipv4/ipmr.c

···
 /*
  *	IP multicast routing support for mrouted 3.6/3.8
  *
- *		(c) 1995 Alan Cox, <[e-mail]>
+ *		(c) 1995 Alan Cox, <[e-mail]>
  *	  Linux Consultancy and Custom Driver Development
  *
  *	This program is free software; you can redistribute it and/or

net/ipv4/udp.c

···
  * Authors:	Ross Biro
  *		Fred N. van Kempen, <[e-mail]>
  *		Arnt Gulbrandsen, <[e-mail]>
- *		Alan Cox, <[e-mail]>
+ *		Alan Cox, <[e-mail]>
  *		Hirokazu Takahashi, <[e-mail]>
  *
  * Fixes:

net/ipv6/af_inet6.c

···
 	snmp_mib_free((void **)net->mib.icmpv6msg_statistics);
 }
 
-static int inet6_net_init(struct net *net)
+static int __net_init inet6_net_init(struct net *net)
 {
 	int err = 0;
 

net/netlink/af_netlink.c

···
 /*
  * NETLINK      Kernel-user communication protocol.
  *
- * 		Authors:	Alan Cox <[e-mail]>
+ * 		Authors:	Alan Cox <[e-mail]>
  * 				Alexey Kuznetsov <[e-mail]>
  *
  *		This program is free software; you can redistribute it and/or

net/sunrpc/xprtsock.c

···
  *
  * Client-side transport implementation for sockets.
  *
- * TCP callback races fixes (C) 1998 Red Hat Software <[e-mail]>
- * TCP send fixes (C) 1998 Red Hat Software <[e-mail]>
+ * TCP callback races fixes (C) 1998 Red Hat
+ * TCP send fixes (C) 1998 Red Hat
  * TCP NFS related read + write fixes
  *  (C) 1999 Dave Airlie, University of Limerick, Ireland <[e-mail]>
  *

net/unix/af_unix.c

···
 /*
  * NET4:	Implementation of BSD Unix domain sockets.
  *
- * Authors:	Alan Cox, <[e-mail]>
+ * Authors:	Alan Cox, <[e-mail]>
  *
  *		This program is free software; you can redistribute it and/or
  *		modify it under the terms of the GNU General Public License