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

19 files changed, 25 insertions, 23 deletions

diff --git a/net/802/psnap.c b/net/802/psnap.c
index b3cfe5a14fca..70980baeb682 100644
--- a/net/802/psnap.c
+++ b/net/802/psnap.c
@@ -1,7 +1,7 @@
 /*
  *      SNAP data link layer. Derived from 802.2
  *
- *              Alan Cox <Alan.Cox@linux.org>,
+ *              Alan Cox <alan@lxorguk.ukuu.org.uk>,
  *              from the 802.2 layer by Greg Page.
  *              Merged in additions from Greg Page's psnap.c.
  *
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 0c850427a85b..d3134e7e6ee8 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -2,7 +2,7 @@
  *      DDP:    An implementation of the AppleTalk DDP protocol for
  *              Ethernet 'ELAP'.
  *
- *              Alan Cox  <Alan.Cox@linux.org>
+ *              Alan Cox  <alan@lxorguk.ukuu.org.uk>
  *
  *              With more than a little assistance from
  *
@@ -1934,6 +1934,6 @@ static void __exit atalk_exit(void)
 module_exit(atalk_exit);
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Alan Cox <Alan.Cox@linux.org>");
+MODULE_AUTHOR("Alan Cox <alan@lxorguk.ukuu.org.uk>");
 MODULE_DESCRIPTION("AppleTalk 0.20\n");
 MODULE_ALIAS_NETPROTO(PF_APPLETALK);
diff --git a/net/core/datagram.c b/net/core/datagram.c
index 52f577a0f544..ee631843c2f5 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -9,7 +9,7 @@
  *      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 <alan@redhat.com>. (datagram_poll() from old
+ *      Authors:        Alan Cox <alan@lxorguk.ukuu.org.uk>. (datagram_poll() from old
  *                                                   udp.c code)
  *
  *      Fixes:
diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c
index 5402b3b38e0d..9e2fa39f22a3 100644
--- a/net/core/dev_mcast.c
+++ b/net/core/dev_mcast.c
@@ -6,7 +6,7 @@
  *              Richard Underwood <richard@wuzz.demon.co.uk>
  *
  *      Stir fried together from the IP multicast and CAP patches above
- *              Alan Cox <Alan.Cox@linux.org>
+ *              Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  *      Fixes:
  *              Alan Cox        :       Update the device on a real delete
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index a756847e3814..99f656d35b4f 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2474,7 +2474,7 @@ static inline int process_ipsec(struct pktgen_dev *pkt_dev,
                                 if (ret < 0) {
                                         printk(KERN_ERR "Error expanding "
                                                "ipsec packet %d\n",ret);
-                                        return 0;
+                                        goto err;
                                 }
                         }
 
@@ -2484,8 +2484,7 @@ static inline int process_ipsec(struct pktgen_dev *pkt_dev,
                         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);
@@ -2494,6 +2493,9 @@ static inline int process_ipsec(struct pktgen_dev *pkt_dev,
                 }
         }
         return 1;
+err:
+        kfree_skb(skb);
+        return 0;
 }
 #endif
 
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 7f7bb1a636d9..4e22e3a35359 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -1,7 +1,7 @@
 /*
  *      Routines having to do with the 'struct sk_buff' memory handlers.
  *
- *      Authors:        Alan Cox <iiitac@pyr.swan.ac.uk>
+ *      Authors:        Alan Cox <alan@lxorguk.ukuu.org.uk>
  *                      Florian La Roche <rzsfl@rz.uni-sb.de>
  *
  *      Fixes:
diff --git a/net/core/stream.c b/net/core/stream.c
index a6b3437ff082..8727cead64ad 100644
--- a/net/core/stream.c
+++ b/net/core/stream.c
@@ -9,7 +9,7 @@
  *
  *     Authors:        Arnaldo Carvalho de Melo <acme@conectiva.com.br>
  *                     (from old tcp.c code)
- *                     Alan Cox <alan@redhat.com> (Borrowed comments 8-))
+ *                     Alan Cox <alan@lxorguk.ukuu.org.uk> (Borrowed comments 8-))
  */
 
 #include <linux/module.h>
diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig
index cdce4c6c672a..49211b35725b 100644
--- a/net/dsa/Kconfig
+++ b/net/dsa/Kconfig
@@ -1,7 +1,7 @@
 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
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 55c355e63234..72b2de76f1cd 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -1,7 +1,7 @@
 /*
  *      NET3:   Implementation of the ICMP protocol layer.
  *
- *              Alan Cox, <alan@redhat.com>
+ *              Alan Cox, <alan@lxorguk.ukuu.org.uk>
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 7f9e337e3908..a0d86455c53e 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -9,7 +9,7 @@
  *      seems to fall out with gcc 2.6.2.
  *
  *      Authors:
- *              Alan Cox <Alan.Cox@linux.org>
+ *              Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 2152d222b954..e4f81f54befe 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -6,7 +6,7 @@
  *              The IP fragmentation functionality.
  *
  * Authors:     Fred N. van Kempen <waltje@uWalt.NL.Mugnet.ORG>
- *              Alan Cox <Alan.Cox@linux.org>
+ *              Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  * Fixes:
  *              Alan Cox        :       Split from ip.c , see ip_input.c for history.
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index e0bed56c51f1..861978a4f1a8 100644
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
@@ -8,7 +8,7 @@
  * Authors:     Ross Biro
  *              Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
  *              Donald Becker, <becker@super.org>
- *              Alan Cox, <Alan.Cox@linux.org>
+ *              Alan Cox, <alan@lxorguk.ukuu.org.uk>
  *              Richard Underwood
  *              Stefan Becker, <stefanb@yello.ping.de>
  *              Jorge Cwik, <jorge@laser.satlink.net>
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 4c6d2caf9203..29609d29df76 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -41,7 +41,7 @@
                 Made the tunnels use dev->name not tunnel: when error reporting.
                 Added tx_dropped stat
 
-                -Alan Cox       (Alan.Cox@linux.org) 21 March 95
+                -Alan Cox       (alan@lxorguk.ukuu.org.uk) 21 March 95
 
         Reworked:
                 Changed to tunnel to destination gateway in addition to the
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index c519b8d30eee..b42e082cc170 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -1,7 +1,7 @@
 /*
  *      IP multicast routing support for mrouted 3.6/3.8
  *
- *              (c) 1995 Alan Cox, <alan@redhat.com>
+ *              (c) 1995 Alan Cox, <alan@lxorguk.ukuu.org.uk>
  *        Linux Consultancy and Custom Driver Development
  *
  *      This program is free software; you can redistribute it and/or
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index eacf4cfef146..2095abc3caba 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -8,7 +8,7 @@
  * Authors:     Ross Biro
  *              Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
  *              Arnt Gulbrandsen, <agulbra@nvg.unit.no>
- *              Alan Cox, <Alan.Cox@linux.org>
+ *              Alan Cox, <alan@lxorguk.ukuu.org.uk>
  *              Hirokazu Takahashi, <taka@valinux.co.jp>
  *
  * Fixes:
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 050e14b7f701..01edac888510 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -834,7 +834,7 @@ static void __net_exit ipv6_cleanup_mibs(struct net *net)
         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;
 
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index b0eacc0007cc..2fd8afac5f71 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1,7 +1,7 @@
 /*
  * NETLINK      Kernel-user communication protocol.
  *
- *              Authors:        Alan Cox <alan@redhat.com>
+ *              Authors:        Alan Cox <alan@lxorguk.ukuu.org.uk>
  *                              Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
  *
  *              This program is free software; you can redistribute it and/or
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 4486c59c3aca..9a288d5eea64 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -3,8 +3,8 @@
  *
  * Client-side transport implementation for sockets.
  *
- * TCP callback races fixes (C) 1998 Red Hat Software <alan@redhat.com>
- * TCP send fixes (C) 1998 Red Hat Software <alan@redhat.com>
+ * 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 <airlied@linux.ie>
  *
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 015606b54d9b..c647aab8d418 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1,7 +1,7 @@
 /*
  * NET4:        Implementation of BSD Unix domain sockets.
  *
- * Authors:     Alan Cox, <alan.cox@linux.org>
+ * Authors:     Alan Cox, <alan@lxorguk.ukuu.org.uk>
  *
  *              This program is free software; you can redistribute it and/or
  *              modify it under the terms of the GNU General Public License