History

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

Linus Torvalds committed 18 years ago

Commit 43096592 parents 79aa79b 485013771 files · +87 −77Browse files

Unified · Split

71 files
  1. drivers/isdn/mISDN/dsp_cmx.c +2 −2
  2. drivers/isdn/mISDN/timerdev.c +1 −1
  3. drivers/net/3c501.c +6 −6
  4. drivers/net/3c515.c +1 −1
  5. drivers/net/Kconfig +1 −1
  6. drivers/net/appletalk/cops.c +1 −1
  7. drivers/net/cxgb3/adapter.h +1 −1
  8. drivers/net/cxgb3/ael1002.c +1 −1
  9. drivers/net/cxgb3/common.h +1 −1
  10. drivers/net/cxgb3/cxgb3_ctl_defs.h +1 −1
  11. drivers/net/cxgb3/cxgb3_defs.h +1 −1
  12. drivers/net/cxgb3/cxgb3_ioctl.h +1 −1
  13. drivers/net/cxgb3/cxgb3_main.c +1 −1
  14. drivers/net/cxgb3/cxgb3_offload.c +1 −1
  15. drivers/net/cxgb3/cxgb3_offload.h +1 −1
  16. drivers/net/cxgb3/firmware_exports.h +1 −1
  17. drivers/net/cxgb3/l2t.c +1 −1
  18. drivers/net/cxgb3/l2t.h +1 −1
  19. drivers/net/cxgb3/mc5.c +1 −1
  20. drivers/net/cxgb3/sge.c +1 −1
  21. drivers/net/cxgb3/t3_cpl.h +1 −1
  22. drivers/net/cxgb3/t3_hw.c +1 −1
  23. drivers/net/cxgb3/t3cdev.h +1 −1
  24. drivers/net/cxgb3/version.h +2 −2
  25. drivers/net/cxgb3/vsc8211.c +1 −1
  26. drivers/net/cxgb3/xgmac.c +1 −1
  27. drivers/net/eexpress.c +1 −1
  28. drivers/net/enic/enic_main.c +1 −0
  29. drivers/net/ibmlana.c +1 −1
  30. drivers/net/jme.c +1 −0
  31. drivers/net/macmace.c +1 −1
  32. drivers/net/pcmcia/3c589_cs.c +1 −1
  33. drivers/net/pcmcia/nmclan_cs.c +1 −1
  34. drivers/net/phy/mdio_bus.c +1 −0
  35. drivers/net/phy/phy_device.c +1 −0
  36. drivers/net/qlge/qlge.h +1 −1
  37. drivers/net/qlge/qlge_main.c +1 −0
  38. drivers/net/tlan.c +2 −1
  39. drivers/net/tokenring/smctr.c +1 −1
  40. drivers/net/tulip/de2104x.c +1 −0
  41. drivers/net/tulip/dmfe.c +2 −2
  42. drivers/net/via-velocity.c +1 −1
  43. drivers/net/wan/z85230.c +2 −1
  44. drivers/net/wan/z85230.h +1 −1
  45. drivers/net/wireless/wavelan.c +1 −1
  46. drivers/net/wireless/wavelan.p.h +1 −1
  47. drivers/s390/net/claw.c +1 −1
  48. include/linux/if_ether.h +1 −1
  49. include/linux/if_fddi.h +1 −1
  50. include/linux/if_hippi.h +1 −1
  51. include/linux/igmp.h +1 −1
  52. include/linux/netdevice.h +1 −1
  53. net/802/psnap.c +1 −1
  54. net/appletalk/ddp.c +2 −2
  55. net/core/datagram.c +1 −1
  56. net/core/dev_mcast.c +1 −1
  57. net/core/pktgen.c +5 −3
  58. net/core/skbuff.c +1 −1
  59. net/core/stream.c +1 −1
  60. net/dsa/Kconfig +1 −1
  61. net/ipv4/icmp.c +1 −1
  62. net/ipv4/igmp.c +1 −1
  63. net/ipv4/ip_fragment.c +1 −1
  64. net/ipv4/ip_input.c +1 −1
  65. net/ipv4/ipip.c +1 −1
  66. net/ipv4/ipmr.c +1 −1
  67. net/ipv4/udp.c +1 −1
  68. net/ipv6/af_inet6.c +1 −1
  69. net/netlink/af_netlink.c +1 −1
  70. net/sunrpc/xprtsock.c +2 −2
  71. net/unix/af_unix.c +1 −1
drivers/isdn/mISDN/dsp_cmx.c+2−2
@@ -452,10 +452,10 @@ one_member: · 451 unmodified lines
452452 if (finddsp->features.pcm_id == dsp->features.pcm_id) {
453453 if (finddsp->pcm_slot_rx >= 0 &&
454454 finddsp->pcm_slot_rx < sizeof(freeslots))
455− freeslots[finddsp->pcm_slot_tx] = 0;
455+ freeslots[finddsp->pcm_slot_rx] = 0;
456456 if (finddsp->pcm_slot_tx >= 0 &&
457457 finddsp->pcm_slot_tx < sizeof(freeslots))
458− freeslots[finddsp->pcm_slot_rx] = 0;
458+ freeslots[finddsp->pcm_slot_tx] = 0;
459459 }
460460 }
461461 i = 0;
drivers/isdn/mISDN/timerdev.c+1−1
@@ -61,7 +61,7 @@ mISDN_open(struct inode *ino, struct file *filep) · 60 unmodified lines
6161 init_waitqueue_head(&dev->wait);
6262 filep->private_data = dev;
6363 __module_get(THIS_MODULE);
64− return 0;
64+ return nonseekable_open(ino, filep);
6565 }
6666
6767 static int
drivers/net/3c501.c+6−6
@@ -17,7 +17,7 @@ · 16 unmodified lines
1717 Annapolis MD 21403
1818
1919 Fixed (again!) the missing interrupt locking on TX/RX shifting.
20− Alan Cox <Alan.Cox@linux.org>
20+ Alan Cox <alan@lxorguk.ukuu.org.uk>
2121
2222 Removed calls to init_etherdev since they are no longer needed, and
2323 cleaned up modularization just a bit. The driver still allows only
@@ -29,16 +29,16 @@ · 5 unmodified lines
2929 the board. Now getting 150K/second FTP with a 3c501 card. Still playing
3030 with a TX-TX optimisation to see if we can touch 180-200K/second as seems
3131 theoretically maximum.
32− 19950402 Alan Cox <Alan.Cox@linux.org>
32+ 19950402 Alan Cox <alan@lxorguk.ukuu.org.uk>
3333
3434 Cleaned up for 2.3.x because we broke SMP now.
35− 20000208 Alan Cox <alan@redhat.com>
35+ 20000208 Alan Cox <alan@lxorguk.ukuu.org.uk>
3636
3737 Check up pass for 2.5. Nothing significant changed
38− 20021009 Alan Cox <alan@redhat.com>
38+ 20021009 Alan Cox <alan@lxorguk.ukuu.org.uk>
3939
4040 Fixed zero fill corner case
41− 20030104 Alan Cox <alan@redhat.com>
41+ 20030104 Alan Cox <alan@lxorguk.ukuu.org.uk>
4242
4343
4444 For the avoidance of doubt the "preferred form" of this code is one which
@@ -104,7 +104,7 @@ · 59 unmodified lines
104104
105105
106106 static const char version[] =
107− DRV_NAME ".c: " DRV_VERSION " Alan Cox (alan@redhat.com).\n";
107+ DRV_NAME ".c: " DRV_VERSION " Alan Cox (alan@lxorguk.ukuu.org.uk).\n";
108108
109109 /*
110110 * Braindamage remaining:
drivers/net/3c515.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
1818
1919 2001/11/17 - Added ethtool support (jgarzik)
2020
21− 2002/10/28 - Locking updates for 2.5 (alan@redhat.com)
21+ 2002/10/28 - Locking updates for 2.5 (alan@lxorguk.ukuu.org.uk)
2222
2323 */
2424
drivers/net/Kconfig+1−1
@@ -2400,7 +2400,7 @@ config EHEA · 2399 unmodified lines
24002400 will be called ehea.
24012401
24022402 config ENIC
2403− tristate "E, the Cisco 10G Ethernet NIC"
2403+ tristate "Cisco 10G Ethernet NIC support"
24042404 depends on PCI && INET
24052405 select INET_LRO
24062406 help
drivers/net/appletalk/cops.c+1−1
@@ -4,7 +4,7 @@ · 3 unmodified lines
44 * - Jay Schulist <jschlst@samba.org>
55 *
66 * With more than a little help from;
7− * - Alan Cox <Alan.Cox@linux.org>
7+ * - Alan Cox <alan@lxorguk.ukuu.org.uk>
88 *
99 * Derived from:
1010 * - skeleton.c: A network driver outline for linux.
drivers/net/cxgb3/adapter.h+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
2+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/ael1002.c+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.
2+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/common.h+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.
2+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/cxgb3_ctl_defs.h+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
2+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/cxgb3_defs.h+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (c) 2006-2007 Chelsio, Inc. All rights reserved.
2+ * Copyright (c) 2006-2008 Chelsio, Inc. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/cxgb3_ioctl.h+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
2+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/cxgb3_main.c+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
2+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/cxgb3_offload.c+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (c) 2006-2007 Chelsio, Inc. All rights reserved.
2+ * Copyright (c) 2006-2008 Chelsio, Inc. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/cxgb3_offload.h+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (c) 2006-2007 Chelsio, Inc. All rights reserved.
2+ * Copyright (c) 2006-2008 Chelsio, Inc. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/firmware_exports.h+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (c) 2004-2007 Chelsio, Inc. All rights reserved.
2+ * Copyright (c) 2004-2008 Chelsio, Inc. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/l2t.c+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
2+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/l2t.h+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
2+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/mc5.c+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
2+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/sge.c+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.
2+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/t3_cpl.h+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (c) 2004-2007 Chelsio, Inc. All rights reserved.
2+ * Copyright (c) 2004-2008 Chelsio, Inc. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/t3_hw.c+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
2+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/t3cdev.h+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (C) 2006-2007 Chelsio Communications. All rights reserved.
2+ * Copyright (C) 2006-2008 Chelsio Communications. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/version.h+2−2
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
2+ * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
@@ -35,7 +35,7 @@ · 29 unmodified lines
3535 #define DRV_DESC "Chelsio T3 Network Driver"
3636 #define DRV_NAME "cxgb3"
3737 /* Driver version */
38−#define DRV_VERSION "1.0-ko"
38+#define DRV_VERSION "1.1.0-ko"
3939
4040 /* Firmware version */
4141 #define FW_VERSION_MAJOR 7
drivers/net/cxgb3/vsc8211.c+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.
2+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/xgmac.c+1−1
@@ -1,5 +1,5 @@
11 /*
2− * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.
2+ * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
33 *
44 * This software is available to you under a choice of one of two
55 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/eexpress.c+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
88 *
99 * Many modifications, and currently maintained, by
1010 * Philip Blundell <philb@gnu.org>
11− * Added the Compaq LTE Alan Cox <alan@redhat.com>
11+ * Added the Compaq LTE Alan Cox <alan@lxorguk.ukuu.org.uk>
1212 * Added MCA support Adam Fritzler
1313 *
1414 * Note - this driver is experimental still - it has problems on faster
drivers/net/enic/enic_main.c+1−0
@@ -34,6 +34,7 @@ · 33 unmodified lines
3434 #include <linux/ip.h>
3535 #include <linux/ipv6.h>
3636 #include <linux/tcp.h>
37+#include <net/ip6_checksum.h>
3738
3839 #include "cq_enet_desc.h"
3940 #include "vnic_dev.h"
drivers/net/ibmlana.c+1−1
@@ -71,7 +71,7 @@ History: · 70 unmodified lines
7171 June 1st, 2000
7272 corrected version codes, added support for the latest 2.3 changes
7373 Oct 28th, 2002
74− cleaned up for the 2.5 tree <alan@redhat.com>
74+ cleaned up for the 2.5 tree <alan@lxorguk.ukuu.org.uk>
7575
7676 *************************************************************************/
7777
drivers/net/jme.c+1−0
@@ -37,6 +37,7 @@ · 36 unmodified lines
3737 #include <linux/tcp.h>
3838 #include <linux/udp.h>
3939 #include <linux/if_vlan.h>
40+#include <net/ip6_checksum.h>
4041 #include "jme.h"
4142
4243 static int force_pseudohp = -1;
drivers/net/macmace.c+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
99 * 2 of the License, or (at your option) any later version.
1010 *
1111 * Copyright (C) 1996 Paul Mackerras.
12− * Copyright (C) 1998 Alan Cox <alan@redhat.com>
12+ * Copyright (C) 1998 Alan Cox <alan@lxorguk.ukuu.org.uk>
1313 *
1414 * Modified heavily by Joshua M. Thompson based on Dave Huang's NetBSD driver
1515 *
drivers/net/pcmcia/3c589_cs.c+1−1
@@ -15,7 +15,7 @@ · 14 unmodified lines
1515 incorporated herein by reference.
1616 Donald Becker may be reached at becker@scyld.com
1717
18− Updated for 2.5.x by Alan Cox <alan@redhat.com>
18+ Updated for 2.5.x by Alan Cox <alan@lxorguk.ukuu.org.uk>
1919
2020 ======================================================================*/
2121
drivers/net/pcmcia/nmclan_cs.c+1−1
@@ -69,7 +69,7 @@ Driver Notes and Issues · 68 unmodified lines
6969 History
7070 -------------------------------------------------------------------------------
7171 Log: nmclan_cs.c,v
72− * 2.5.75-ac1 2003/07/11 Alan Cox <alan@redhat.com>
72+ * 2.5.75-ac1 2003/07/11 Alan Cox <alan@lxorguk.ukuu.org.uk>
7373 * Fixed hang on card eject as we probe it
7474 * Cleaned up to use new style locking.
7575 *
drivers/net/phy/mdio_bus.c+1−0
@@ -55,6 +55,7 @@ EXPORT_SYMBOL(mdiobus_alloc); · 54 unmodified lines
5555
5656 /**
5757 * mdiobus_release - mii_bus device release callback
58+ * @d: the target struct device that contains the mii_bus
5859 *
5960 * Description: called when the last reference to an mii_bus is
6061 * dropped, to free the underlying memory.
drivers/net/phy/phy_device.c+1−0
@@ -557,6 +557,7 @@ int genphy_restart_aneg(struct phy_device *phydev) · 556 unmodified lines
557557
558558 return ctl;
559559 }
560+EXPORT_SYMBOL(genphy_restart_aneg);
560561
561562
562563 /**
drivers/net/qlge/qlge.h+1−1
@@ -58,7 +58,7 @@ · 57 unmodified lines
5858 */
5959 #if (PAGE_SHIFT == 12) || (PAGE_SHIFT == 13) /* 4k & 8k pages */
6060 #define TX_DESC_PER_OAL ((MAX_SKB_FRAGS - TX_DESC_PER_IOCB) + 2)
61−#elif (PAGE_SHIFT == 16) /* 64k pages */
61+#else /* all other page sizes */
6262 #define TX_DESC_PER_OAL 0
6363 #endif
6464
drivers/net/qlge/qlge_main.c+1−0
@@ -39,6 +39,7 @@ · 38 unmodified lines
3939 #include <linux/delay.h>
4040 #include <linux/mm.h>
4141 #include <linux/vmalloc.h>
42+#include <net/ip6_checksum.h>
4243
4344 #include "qlge.h"
4445
drivers/net/tlan.c+2−1
@@ -29,7 +29,8 @@ · 28 unmodified lines
2929 *
3030 * Tigran Aivazian <tigran@sco.com>: TLan_PciProbe() now uses
3131 * new PCI BIOS interface.
32− * Alan Cox <alan@redhat.com>: Fixed the out of memory
32+ * Alan Cox <alan@lxorguk.ukuu.org.uk>:
33+ * Fixed the out of memory
3334 * handling.
3435 *
3536 * Torben Mathiasen <torben.mathiasen@compaq.com> New Maintainer!
drivers/net/tokenring/smctr.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525 * To do:
2626 * 1. Multicast support.
2727 *
28− * Initial 2.5 cleanup Alan Cox <alan@redhat.com> 2002/10/28
28+ * Initial 2.5 cleanup Alan Cox <alan@lxorguk.ukuu.org.uk> 2002/10/28
2929 */
3030
3131 #include <linux/module.h>
drivers/net/tulip/de2104x.c+1−0
@@ -1688,6 +1688,7 @@ static void __devinit de21040_get_mac_address (struct de_private *de) · 1687 unmodified lines
16881688 unsigned i;
16891689
16901690 dw32 (ROMCmd, 0); /* Reset the pointer with a dummy write. */
1691+ udelay(5);
16911692
16921693 for (i = 0; i < 6; i++) {
16931694 int value, boguscnt = 100000;
drivers/net/tulip/dmfe.c+2−2
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323 Marcelo Tosatti <marcelo@conectiva.com.br> :
2424 Made it compile in 2.3 (device to net_device)
2525
26− Alan Cox <alan@redhat.com> :
26+ Alan Cox <alan@lxorguk.ukuu.org.uk> :
2727 Cleaned up for kernel merge.
2828 Removed the back compatibility support
2929 Reformatted, fixing spelling etc as I went
@@ -49,7 +49,7 @@ · 19 unmodified lines
4949 support. Updated PCI resource allocation. Do not
5050 forget to unmap PCI mapped skbs.
5151
52− Alan Cox <alan@redhat.com>
52+ Alan Cox <alan@lxorguk.ukuu.org.uk>
5353 Added new PCI identifiers provided by Clear Zhang at ALi
5454 for their 1563 ethernet device.
5555
drivers/net/via-velocity.c+1−1
@@ -12,7 +12,7 @@ · 11 unmodified lines
1212 * Scatter gather
1313 * More testing
1414 *
15− * The changes are (c) Copyright 2004, Red Hat Inc. <alan@redhat.com>
15+ * The changes are (c) Copyright 2004, Red Hat Inc. <alan@lxorguk.ukuu.org.uk>
1616 * Additional fixes and clean up: Francois Romieu
1717 *
1818 * This source has not been verified for use in safety critical systems.
drivers/net/wan/z85230.c+2−1
@@ -18,7 +18,8 @@ · 17 unmodified lines
1818 * DMA now uses get_free_page as kmalloc buffers may span a 64K
1919 * boundary.
2020 *
21− * Modified for SMP safety and SMP locking by Alan Cox <alan@redhat.com>
21+ * Modified for SMP safety and SMP locking by Alan Cox
22+ * <alan@lxorguk.ukuu.org.uk>
2223 *
2324 * Performance
2425 *
drivers/net/wan/z85230.h+1−1
@@ -2,7 +2,7 @@ · 1 unmodified line
22 * Description of Z8530 Z85C30 and Z85230 communications chips
33 *
44 * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
5− * Copyright (C) 1998 Alan Cox <alan@redhat.com>
5+ * Copyright (C) 1998 Alan Cox <alan@lxorguk.ukuu.org.uk>
66 */
77
88 #ifndef _Z8530_H
drivers/net/wireless/wavelan.c+1−1
@@ -4387,7 +4387,7 @@ MODULE_LICENSE("GPL"); · 4386 unmodified lines
43874387 *
43884388 * Thanks go also to:
43894389 * James Ashton (jaa101@syseng.anu.edu.au),
4390− * Alan Cox (alan@redhat.com),
4390+ * Alan Cox (alan@lxorguk.ukuu.org.uk),
43914391 * Allan Creighton (allanc@cs.usyd.edu.au),
43924392 * Matthew Geier (matthew@cs.usyd.edu.au),
43934393 * Remo di Giovanni (remo@cs.usyd.edu.au),
drivers/net/wireless/wavelan.p.h+1−1
@@ -186,7 +186,7 @@ · 185 unmodified lines
186186 *
187187 * Thanks go also to:
188188 * James Ashton <jaa101@syseng.anu.edu.au>,
189− * Alan Cox <alan@redhat.com>,
189+ * Alan Cox <alan@lxorguk.ukuu.org.uk>,
190190 * Allan Creighton <allanc@cs.usyd.edu.au>,
191191 * Matthew Geier <matthew@cs.usyd.edu.au>,
192192 * Remo di Giovanni <remo@cs.usyd.edu.au>,
drivers/s390/net/claw.c+1−1
@@ -2913,7 +2913,7 @@ claw_new_device(struct ccwgroup_device *cgdev) · 2912 unmodified lines
29132913 if (ret != 0) {
29142914 printk(KERN_WARNING
29152915 "claw: ccw_device_set_online %s WRITE failed "
2916− "with ret = %d\n", dev_name(&cgdev->cdev[WRITE]->dev)
2916+ "with ret = %d\n", dev_name(&cgdev->cdev[WRITE]->dev),
29172917 ret);
29182918 goto out;
29192919 }
include/linux/if_ether.h+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
99 *
1010 * Author: Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
1111 * Donald Becker, <becker@super.org>
12− * Alan Cox, <alan@redhat.com>
12+ * Alan Cox, <alan@lxorguk.ukuu.org.uk>
1313 * Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>
1414 *
1515 * This program is free software; you can redistribute it and/or
include/linux/if_fddi.h+1−1
@@ -12,7 +12,7 @@ · 11 unmodified lines
1212 * if_fddi.h is based on previous if_ether.h and if_tr.h work by
1313 * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
1414 * Donald Becker, <becker@super.org>
15− * Alan Cox, <alan@redhat.com>
15+ * Alan Cox, <alan@lxorguk.ukuu.org.uk>
1616 * Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>
1717 * Peter De Schrijver, <stud11@cc4.kuleuven.ac.be>
1818 *
include/linux/if_hippi.h+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
99 *
1010 * Author: Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
1111 * Donald Becker, <becker@super.org>
12− * Alan Cox, <alan@redhat.com>
12+ * Alan Cox, <alan@lxorguk.ukuu.org.uk>
1313 * Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>
1414 * Jes Sorensen, <Jes.Sorensen@cern.ch>
1515 *
include/linux/igmp.h+1−1
@@ -2,7 +2,7 @@ · 1 unmodified line
22 * Linux NET3: Internet Group Management Protocol [IGMP]
33 *
44 * Authors:
5− * Alan Cox <Alan.Cox@linux.org>
5+ * Alan Cox <alan@lxorguk.ukuu.org.uk>
66 *
77 * Extended to talk the BSD extended IGMP protocol of mrouted 3.6
88 *
include/linux/netdevice.h+1−1
@@ -11,7 +11,7 @@ · 10 unmodified lines
1111 * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
1212 * Corey Minyard <wf-rch!minyard@relay.EU.net>
1313 * Donald J. Becker, <becker@cesdis.gsfc.nasa.gov>
14− * Alan Cox, <Alan.Cox@linux.org>
14+ * Alan Cox, <alan@lxorguk.ukuu.org.uk>
1515 * Bjorn Ekwall. <bj0rn@blox.se>
1616 * Pekka Riikonen <priikone@poseidon.pspt.fi>
1717 *
net/802/psnap.c+1−1
@@ -1,7 +1,7 @@
11 /*
22 * SNAP data link layer. Derived from 802.2
33 *
4− * Alan Cox <Alan.Cox@linux.org>,
4+ * Alan Cox <alan@lxorguk.ukuu.org.uk>,
55 * from the 802.2 layer by Greg Page.
66 * Merged in additions from Greg Page's psnap.c.
77 *
net/appletalk/ddp.c+2−2
@@ -2,7 +2,7 @@ · 1 unmodified line
22 * DDP: An implementation of the AppleTalk DDP protocol for
33 * Ethernet 'ELAP'.
44 *
5− * Alan Cox <Alan.Cox@linux.org>
5+ * Alan Cox <alan@lxorguk.ukuu.org.uk>
66 *
77 * With more than a little assistance from
88 *
@@ -1934,6 +1934,6 @@ static void __exit atalk_exit(void) · 1925 unmodified lines
19341934 module_exit(atalk_exit);
19351935
19361936 MODULE_LICENSE("GPL");
1937−MODULE_AUTHOR("Alan Cox <Alan.Cox@linux.org>");
1937+MODULE_AUTHOR("Alan Cox <alan@lxorguk.ukuu.org.uk>");
19381938 MODULE_DESCRIPTION("AppleTalk 0.20\n");
19391939 MODULE_ALIAS_NETPROTO(PF_APPLETALK);
net/core/datagram.c+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
99 * identical recvmsg() code. So we share it here. The poll was
1010 * shared before but buried in udp.c so I moved it.
1111 *
12− * Authors: Alan Cox <alan@redhat.com>. (datagram_poll() from old
12+ * Authors: Alan Cox <alan@lxorguk.ukuu.org.uk>. (datagram_poll() from old
1313 * udp.c code)
1414 *
1515 * Fixes:
net/core/dev_mcast.c+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 * Richard Underwood <richard@wuzz.demon.co.uk>
77 *
88 * Stir fried together from the IP multicast and CAP patches above
9− * Alan Cox <Alan.Cox@linux.org>
9+ * Alan Cox <alan@lxorguk.ukuu.org.uk>
1010 *
1111 * Fixes:
1212 * Alan Cox : Update the device on a real delete
net/core/pktgen.c+5−3
@@ -2474,7 +2474,7 @@ static inline int process_ipsec(struct pktgen_dev *pkt_dev, · 2473 unmodified lines
24742474 if (ret < 0) {
24752475 printk(KERN_ERR "Error expanding "
24762476 "ipsec packet %d\n",ret);
2477− return 0;
2477+ goto err;
24782478 }
24792479 }
24802480
@@ -2484,8 +2484,7 @@ static inline int process_ipsec(struct pktgen_dev *pkt_dev, · 3 unmodified lines
24842484 if (ret) {
24852485 printk(KERN_ERR "Error creating ipsec "
24862486 "packet %d\n",ret);
2487− kfree_skb(skb);
2488− return 0;
2487+ goto err;
24892488 }
24902489 /* restore ll */
24912490 eth = (__u8 *) skb_push(skb, ETH_HLEN);
@@ -2494,6 +2493,9 @@ static inline int process_ipsec(struct pktgen_dev *pkt_dev, · 2 unmodified lines
24942493 }
24952494 }
24962495 return 1;
2496+err:
2497+ kfree_skb(skb);
2498+ return 0;
24972499 }
24982500 #endif
24992501
net/core/skbuff.c+1−1
@@ -1,7 +1,7 @@
11 /*
22 * Routines having to do with the 'struct sk_buff' memory handlers.
33 *
4− * Authors: Alan Cox <iiitac@pyr.swan.ac.uk>
4+ * Authors: Alan Cox <alan@lxorguk.ukuu.org.uk>
55 * Florian La Roche <rzsfl@rz.uni-sb.de>
66 *
77 * Fixes:
net/core/stream.c+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
99 *
1010 * Authors: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
1111 * (from old tcp.c code)
12− * Alan Cox <alan@redhat.com> (Borrowed comments 8-))
12+ * Alan Cox <alan@lxorguk.ukuu.org.uk> (Borrowed comments 8-))
1313 */
1414
1515 #include <linux/module.h>
net/dsa/Kconfig+1−1
@@ -1,7 +1,7 @@
11 menuconfig NET_DSA
22 bool "Distributed Switch Architecture support"
33 default n
4− depends on EXPERIMENTAL
4+ depends on EXPERIMENTAL && !S390
55 select PHYLIB
66 ---help---
77 This allows you to use hardware switch chips that use
net/ipv4/icmp.c+1−1
@@ -1,7 +1,7 @@
11 /*
22 * NET3: Implementation of the ICMP protocol layer.
33 *
4− * Alan Cox, <alan@redhat.com>
4+ * Alan Cox, <alan@lxorguk.ukuu.org.uk>
55 *
66 * This program is free software; you can redistribute it and/or
77 * modify it under the terms of the GNU General Public License
net/ipv4/igmp.c+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
99 * seems to fall out with gcc 2.6.2.
1010 *
1111 * Authors:
12− * Alan Cox <Alan.Cox@linux.org>
12+ * Alan Cox <alan@lxorguk.ukuu.org.uk>
1313 *
1414 * This program is free software; you can redistribute it and/or
1515 * modify it under the terms of the GNU General Public License
net/ipv4/ip_fragment.c+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 * The IP fragmentation functionality.
77 *
88 * Authors: Fred N. van Kempen <waltje@uWalt.NL.Mugnet.ORG>
9− * Alan Cox <Alan.Cox@linux.org>
9+ * Alan Cox <alan@lxorguk.ukuu.org.uk>
1010 *
1111 * Fixes:
1212 * Alan Cox : Split from ip.c , see ip_input.c for history.
net/ipv4/ip_input.c+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
88 * Authors: Ross Biro
99 * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
1010 * Donald Becker, <becker@super.org>
11− * Alan Cox, <Alan.Cox@linux.org>
11+ * Alan Cox, <alan@lxorguk.ukuu.org.uk>
1212 * Richard Underwood
1313 * Stefan Becker, <stefanb@yello.ping.de>
1414 * Jorge Cwik, <jorge@laser.satlink.net>
net/ipv4/ipip.c+1−1
@@ -41,7 +41,7 @@ · 40 unmodified lines
4141 Made the tunnels use dev->name not tunnel: when error reporting.
4242 Added tx_dropped stat
4343
44− -Alan Cox (Alan.Cox@linux.org) 21 March 95
44+ -Alan Cox (alan@lxorguk.ukuu.org.uk) 21 March 95
4545
4646 Reworked:
4747 Changed to tunnel to destination gateway in addition to the
net/ipv4/ipmr.c+1−1
@@ -1,7 +1,7 @@
11 /*
22 * IP multicast routing support for mrouted 3.6/3.8
33 *
4− * (c) 1995 Alan Cox, <alan@redhat.com>
4+ * (c) 1995 Alan Cox, <alan@lxorguk.ukuu.org.uk>
55 * Linux Consultancy and Custom Driver Development
66 *
77 * This program is free software; you can redistribute it and/or
net/ipv4/udp.c+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
88 * Authors: Ross Biro
99 * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
1010 * Arnt Gulbrandsen, <agulbra@nvg.unit.no>
11− * Alan Cox, <Alan.Cox@linux.org>
11+ * Alan Cox, <alan@lxorguk.ukuu.org.uk>
1212 * Hirokazu Takahashi, <taka@valinux.co.jp>
1313 *
1414 * Fixes:
net/ipv6/af_inet6.c+1−1
@@ -834,7 +834,7 @@ static void __net_exit ipv6_cleanup_mibs(struct net *net) · 833 unmodified lines
834834 snmp_mib_free((void **)net->mib.icmpv6msg_statistics);
835835 }
836836
837−static int inet6_net_init(struct net *net)
837+static int __net_init inet6_net_init(struct net *net)
838838 {
839839 int err = 0;
840840
net/netlink/af_netlink.c+1−1
@@ -1,7 +1,7 @@
11 /*
22 * NETLINK Kernel-user communication protocol.
33 *
4− * Authors: Alan Cox <alan@redhat.com>
4+ * Authors: Alan Cox <alan@lxorguk.ukuu.org.uk>
55 * Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
66 *
77 * This program is free software; you can redistribute it and/or
net/sunrpc/xprtsock.c+2−2
@@ -3,8 +3,8 @@ · 2 unmodified lines
33 *
44 * Client-side transport implementation for sockets.
55 *
6− * TCP callback races fixes (C) 1998 Red Hat Software <alan@redhat.com>
7− * TCP send fixes (C) 1998 Red Hat Software <alan@redhat.com>
6+ * TCP callback races fixes (C) 1998 Red Hat
7+ * TCP send fixes (C) 1998 Red Hat
88 * TCP NFS related read + write fixes
99 * (C) 1999 Dave Airlie, University of Limerick, Ireland <airlied@linux.ie>
1010 *
net/unix/af_unix.c+1−1
@@ -1,7 +1,7 @@
11 /*
22 * NET4: Implementation of BSD Unix domain sockets.
33 *
4− * Authors: Alan Cox, <alan.cox@linux.org>
4+ * Authors: Alan Cox, <alan@lxorguk.ukuu.org.uk>
55 *
66 * This program is free software; you can redistribute it and/or
77 * modify it under the terms of the GNU General Public License