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
452 if (finddsp->features.pcm_id == dsp->features.pcm_id) {452 if (finddsp->features.pcm_id == dsp->features.pcm_id) {
453 if (finddsp->pcm_slot_rx >= 0 &&453 if (finddsp->pcm_slot_rx >= 0 &&
454 finddsp->pcm_slot_rx < sizeof(freeslots))454 finddsp->pcm_slot_rx < sizeof(freeslots))
455 freeslots[finddsp->pcm_slot_tx] = 0;455 freeslots[finddsp->pcm_slot_rx] = 0;
456 if (finddsp->pcm_slot_tx >= 0 &&456 if (finddsp->pcm_slot_tx >= 0 &&
457 finddsp->pcm_slot_tx < sizeof(freeslots))457 finddsp->pcm_slot_tx < sizeof(freeslots))
458 freeslots[finddsp->pcm_slot_rx] = 0;458 freeslots[finddsp->pcm_slot_tx] = 0;
459 }459 }
460 }460 }
461 i = 0;461 i = 0;
drivers/isdn/mISDN/timerdev.c+1−1
@@ -61,7 +61,7 @@ mISDN_open(struct inode *ino, struct file *filep) · 60 unmodified lines
61 init_waitqueue_head(&dev->wait);61 init_waitqueue_head(&dev->wait);
62 filep->private_data = dev;62 filep->private_data = dev;
63 __module_get(THIS_MODULE);63 __module_get(THIS_MODULE);
64 return 0;64 return nonseekable_open(ino, filep);
65}65}
66 66
67static int67static int
drivers/net/3c501.c+6−6
@@ -17,7 +17,7 @@ · 16 unmodified lines
17 Annapolis MD 2140317 Annapolis MD 21403
18 18
19 Fixed (again!) the missing interrupt locking on TX/RX shifting.19 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>
21 21
22 Removed calls to init_etherdev since they are no longer needed, and22 Removed calls to init_etherdev since they are no longer needed, and
23 cleaned up modularization just a bit. The driver still allows only23 cleaned up modularization just a bit. The driver still allows only
@@ -29,16 +29,16 @@ · 5 unmodified lines
29 the board. Now getting 150K/second FTP with a 3c501 card. Still playing29 the board. Now getting 150K/second FTP with a 3c501 card. Still playing
30 with a TX-TX optimisation to see if we can touch 180-200K/second as seems30 with a TX-TX optimisation to see if we can touch 180-200K/second as seems
31 theoretically maximum.31 theoretically maximum.
32 19950402 Alan Cox <Alan.Cox@linux.org>32 19950402 Alan Cox <alan@lxorguk.ukuu.org.uk>
33 33
34 Cleaned up for 2.3.x because we broke SMP now.34 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>
36 36
37 Check up pass for 2.5. Nothing significant changed37 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>
39 39
40 Fixed zero fill corner case40 Fixed zero fill corner case
41 20030104 Alan Cox <alan@redhat.com>41 20030104 Alan Cox <alan@lxorguk.ukuu.org.uk>
42 42
43 43
44 For the avoidance of doubt the "preferred form" of this code is one which44 For the avoidance of doubt the "preferred form" of this code is one which
@@ -104,7 +104,7 @@ · 59 unmodified lines
104 104
105 105
106static const char version[] =106static 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";
108 108
109/*109/*
110 * Braindamage remaining:110 * Braindamage remaining:
drivers/net/3c515.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
18 18
19 2001/11/17 - Added ethtool support (jgarzik)19 2001/11/17 - Added ethtool support (jgarzik)
20 20
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)
22 22
23*/23*/
24 24
drivers/net/Kconfig+1−1
@@ -2400,7 +2400,7 @@ config EHEA · 2399 unmodified lines
2400 will be called ehea.2400 will be called ehea.
2401 2401
2402config ENIC2402config ENIC
2403 tristate "E, the Cisco 10G Ethernet NIC"2403 tristate "Cisco 10G Ethernet NIC support"
2404 depends on PCI && INET2404 depends on PCI && INET
2405 select INET_LRO2405 select INET_LRO
2406 help2406 help
drivers/net/appletalk/cops.c+1−1
@@ -4,7 +4,7 @@ · 3 unmodified lines
4 * - Jay Schulist <jschlst@samba.org>4 * - Jay Schulist <jschlst@samba.org>
5 *5 *
6 * With more than a little help from;6 * With more than a little help from;
7 * - Alan Cox <Alan.Cox@linux.org> 7 * - Alan Cox <alan@lxorguk.ukuu.org.uk>
8 *8 *
9 * Derived from:9 * Derived from:
10 * - skeleton.c: A network driver outline for linux.10 * - skeleton.c: A network driver outline for linux.
drivers/net/cxgb3/adapter.h+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.2 * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/ael1002.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.2 * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/common.h+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.2 * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * 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 @@
1/*1/*
2 * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.2 * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * 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 @@
1/*1/*
2 * Copyright (c) 2006-2007 Chelsio, Inc. All rights reserved.2 * Copyright (c) 2006-2008 Chelsio, Inc. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * 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 @@
1/*1/*
2 * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.2 * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * 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 @@
1/*1/*
2 * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.2 * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * 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 @@
1/*1/*
2 * Copyright (c) 2006-2007 Chelsio, Inc. All rights reserved.2 * Copyright (c) 2006-2008 Chelsio, Inc. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * 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 @@
1/*1/*
2 * Copyright (c) 2006-2007 Chelsio, Inc. All rights reserved.2 * Copyright (c) 2006-2008 Chelsio, Inc. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * 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 @@
1/*1/*
2 * Copyright (c) 2004-2007 Chelsio, Inc. All rights reserved.2 * Copyright (c) 2004-2008 Chelsio, Inc. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/l2t.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.2 * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/l2t.h+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.2 * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/mc5.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.2 * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/sge.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.2 * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * 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 @@
1/*1/*
2 * Copyright (c) 2004-2007 Chelsio, Inc. All rights reserved.2 * Copyright (c) 2004-2008 Chelsio, Inc. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * 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 @@
1/*1/*
2 * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.2 * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/t3cdev.h+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2006-2007 Chelsio Communications. All rights reserved.2 * Copyright (C) 2006-2008 Chelsio Communications. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/version.h+2−2
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.2 * Copyright (c) 2003-2008 Chelsio, Inc. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * licenses. You may choose to be licensed under the terms of the GNU
@@ -35,7 +35,7 @@ · 29 unmodified lines
35#define DRV_DESC "Chelsio T3 Network Driver"35#define DRV_DESC "Chelsio T3 Network Driver"
36#define DRV_NAME "cxgb3"36#define DRV_NAME "cxgb3"
37/* Driver version */37/* Driver version */
38#define DRV_VERSION "1.0-ko"38#define DRV_VERSION "1.1.0-ko"
39 39
40/* Firmware version */40/* Firmware version */
41#define FW_VERSION_MAJOR 741#define FW_VERSION_MAJOR 7
drivers/net/cxgb3/vsc8211.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.2 * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * licenses. You may choose to be licensed under the terms of the GNU
drivers/net/cxgb3/xgmac.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2005-2007 Chelsio, Inc. All rights reserved.2 * Copyright (c) 2005-2008 Chelsio, Inc. All rights reserved.
3 *3 *
4 * This software is available to you under a choice of one of two4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU5 * 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
8 *8 *
9 * Many modifications, and currently maintained, by9 * Many modifications, and currently maintained, by
10 * Philip Blundell <philb@gnu.org>10 * 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>
12 * Added MCA support Adam Fritzler12 * Added MCA support Adam Fritzler
13 *13 *
14 * Note - this driver is experimental still - it has problems on faster14 * 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
34#include <linux/ip.h>34#include <linux/ip.h>
35#include <linux/ipv6.h>35#include <linux/ipv6.h>
36#include <linux/tcp.h>36#include <linux/tcp.h>
37#include <net/ip6_checksum.h>
37 38
38#include "cq_enet_desc.h"39#include "cq_enet_desc.h"
39#include "vnic_dev.h"40#include "vnic_dev.h"
drivers/net/ibmlana.c+1−1
@@ -71,7 +71,7 @@ History: · 70 unmodified lines
71 June 1st, 200071 June 1st, 2000
72 corrected version codes, added support for the latest 2.3 changes72 corrected version codes, added support for the latest 2.3 changes
73 Oct 28th, 200273 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>
75 75
76 *************************************************************************/76 *************************************************************************/
77 77
drivers/net/jme.c+1−0
@@ -37,6 +37,7 @@ · 36 unmodified lines
37#include <linux/tcp.h>37#include <linux/tcp.h>
38#include <linux/udp.h>38#include <linux/udp.h>
39#include <linux/if_vlan.h>39#include <linux/if_vlan.h>
40#include <net/ip6_checksum.h>
40#include "jme.h"41#include "jme.h"
41 42
42static int force_pseudohp = -1;43static int force_pseudohp = -1;
drivers/net/macmace.c+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
9 * 2 of the License, or (at your option) any later version.9 * 2 of the License, or (at your option) any later version.
10 *10 *
11 * Copyright (C) 1996 Paul Mackerras.11 * 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>
13 *13 *
14 * Modified heavily by Joshua M. Thompson based on Dave Huang's NetBSD driver14 * Modified heavily by Joshua M. Thompson based on Dave Huang's NetBSD driver
15 *15 *
drivers/net/pcmcia/3c589_cs.c+1−1
@@ -15,7 +15,7 @@ · 14 unmodified lines
15 incorporated herein by reference.15 incorporated herein by reference.
16 Donald Becker may be reached at becker@scyld.com16 Donald Becker may be reached at becker@scyld.com
17 17
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>
19 19
20======================================================================*/20======================================================================*/
21 21
drivers/net/pcmcia/nmclan_cs.c+1−1
@@ -69,7 +69,7 @@ Driver Notes and Issues · 68 unmodified lines
69History69History
70-------------------------------------------------------------------------------70-------------------------------------------------------------------------------
71Log: nmclan_cs.c,v71Log: 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>
73 * Fixed hang on card eject as we probe it73 * Fixed hang on card eject as we probe it
74 * Cleaned up to use new style locking.74 * Cleaned up to use new style locking.
75 *75 *
drivers/net/phy/mdio_bus.c+1−0
@@ -55,6 +55,7 @@ EXPORT_SYMBOL(mdiobus_alloc); · 54 unmodified lines
55 55
56/**56/**
57 * mdiobus_release - mii_bus device release callback57 * mdiobus_release - mii_bus device release callback
58 * @d: the target struct device that contains the mii_bus
58 *59 *
59 * Description: called when the last reference to an mii_bus is60 * Description: called when the last reference to an mii_bus is
60 * dropped, to free the underlying memory.61 * 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
557 557
558 return ctl;558 return ctl;
559}559}
560EXPORT_SYMBOL(genphy_restart_aneg);
560 561
561 562
562/**563/**
drivers/net/qlge/qlge.h+1−1
@@ -58,7 +58,7 @@ · 57 unmodified lines
58 */58 */
59#if (PAGE_SHIFT == 12) || (PAGE_SHIFT == 13) /* 4k & 8k pages */59#if (PAGE_SHIFT == 12) || (PAGE_SHIFT == 13) /* 4k & 8k pages */
60#define TX_DESC_PER_OAL ((MAX_SKB_FRAGS - TX_DESC_PER_IOCB) + 2)60#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 */
62#define TX_DESC_PER_OAL 062#define TX_DESC_PER_OAL 0
63#endif63#endif
64 64
drivers/net/qlge/qlge_main.c+1−0
@@ -39,6 +39,7 @@ · 38 unmodified lines
39#include <linux/delay.h>39#include <linux/delay.h>
40#include <linux/mm.h>40#include <linux/mm.h>
41#include <linux/vmalloc.h>41#include <linux/vmalloc.h>
42#include <net/ip6_checksum.h>
42 43
43#include "qlge.h"44#include "qlge.h"
44 45
drivers/net/tlan.c+2−1
@@ -29,7 +29,8 @@ · 28 unmodified lines
29 *29 *
30 * Tigran Aivazian <tigran@sco.com>: TLan_PciProbe() now uses30 * Tigran Aivazian <tigran@sco.com>: TLan_PciProbe() now uses
31 * new PCI BIOS interface.31 * new PCI BIOS interface.
32 * Alan Cox <alan@redhat.com>: Fixed the out of memory32 * Alan Cox <alan@lxorguk.ukuu.org.uk>:
33 * Fixed the out of memory
33 * handling.34 * handling.
34 *35 *
35 * Torben Mathiasen <torben.mathiasen@compaq.com> New Maintainer!36 * Torben Mathiasen <torben.mathiasen@compaq.com> New Maintainer!
drivers/net/tokenring/smctr.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
25 * To do:25 * To do:
26 * 1. Multicast support.26 * 1. Multicast support.
27 *27 *
28 * Initial 2.5 cleanup Alan Cox <alan@redhat.com> 2002/10/2828 * Initial 2.5 cleanup Alan Cox <alan@lxorguk.ukuu.org.uk> 2002/10/28
29 */29 */
30 30
31#include <linux/module.h>31#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
1688 unsigned i;1688 unsigned i;
1689 1689
1690 dw32 (ROMCmd, 0); /* Reset the pointer with a dummy write. */1690 dw32 (ROMCmd, 0); /* Reset the pointer with a dummy write. */
1691 udelay(5);
1691 1692
1692 for (i = 0; i < 6; i++) {1693 for (i = 0; i < 6; i++) {
1693 int value, boguscnt = 100000;1694 int value, boguscnt = 100000;
drivers/net/tulip/dmfe.c+2−2
@@ -23,7 +23,7 @@ · 22 unmodified lines
23 Marcelo Tosatti <marcelo@conectiva.com.br> :23 Marcelo Tosatti <marcelo@conectiva.com.br> :
24 Made it compile in 2.3 (device to net_device)24 Made it compile in 2.3 (device to net_device)
25 25
26 Alan Cox <alan@redhat.com> :26 Alan Cox <alan@lxorguk.ukuu.org.uk> :
27 Cleaned up for kernel merge.27 Cleaned up for kernel merge.
28 Removed the back compatibility support28 Removed the back compatibility support
29 Reformatted, fixing spelling etc as I went29 Reformatted, fixing spelling etc as I went
@@ -49,7 +49,7 @@ · 19 unmodified lines
49 support. Updated PCI resource allocation. Do not49 support. Updated PCI resource allocation. Do not
50 forget to unmap PCI mapped skbs.50 forget to unmap PCI mapped skbs.
51 51
52 Alan Cox <alan@redhat.com>52 Alan Cox <alan@lxorguk.ukuu.org.uk>
53 Added new PCI identifiers provided by Clear Zhang at ALi53 Added new PCI identifiers provided by Clear Zhang at ALi
54 for their 1563 ethernet device.54 for their 1563 ethernet device.
55 55
drivers/net/via-velocity.c+1−1
@@ -12,7 +12,7 @@ · 11 unmodified lines
12 * Scatter gather12 * Scatter gather
13 * More testing13 * More testing
14 *14 *
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>
16 * Additional fixes and clean up: Francois Romieu16 * Additional fixes and clean up: Francois Romieu
17 *17 *
18 * This source has not been verified for use in safety critical systems.18 * 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
18 * DMA now uses get_free_page as kmalloc buffers may span a 64K 18 * DMA now uses get_free_page as kmalloc buffers may span a 64K
19 * boundary.19 * boundary.
20 *20 *
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>
22 *23 *
23 * Performance24 * Performance
24 *25 *
drivers/net/wan/z85230.h+1−1
@@ -2,7 +2,7 @@ · 1 unmodified line
2 * Description of Z8530 Z85C30 and Z85230 communications chips2 * Description of Z8530 Z85C30 and Z85230 communications chips
3 *3 *
4 * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)4 * 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>
6 */6 */
7 7
8#ifndef _Z8530_H8#ifndef _Z8530_H
drivers/net/wireless/wavelan.c+1−1
@@ -4387,7 +4387,7 @@ MODULE_LICENSE("GPL"); · 4386 unmodified lines
4387 *4387 *
4388 * Thanks go also to:4388 * Thanks go also to:
4389 * James Ashton (jaa101@syseng.anu.edu.au),4389 * James Ashton (jaa101@syseng.anu.edu.au),
4390 * Alan Cox (alan@redhat.com),4390 * Alan Cox (alan@lxorguk.ukuu.org.uk),
4391 * Allan Creighton (allanc@cs.usyd.edu.au),4391 * Allan Creighton (allanc@cs.usyd.edu.au),
4392 * Matthew Geier (matthew@cs.usyd.edu.au),4392 * Matthew Geier (matthew@cs.usyd.edu.au),
4393 * Remo di Giovanni (remo@cs.usyd.edu.au),4393 * Remo di Giovanni (remo@cs.usyd.edu.au),
drivers/net/wireless/wavelan.p.h+1−1
@@ -186,7 +186,7 @@ · 185 unmodified lines
186 *186 *
187 * Thanks go also to:187 * Thanks go also to:
188 * James Ashton <jaa101@syseng.anu.edu.au>,188 * James Ashton <jaa101@syseng.anu.edu.au>,
189 * Alan Cox <alan@redhat.com>,189 * Alan Cox <alan@lxorguk.ukuu.org.uk>,
190 * Allan Creighton <allanc@cs.usyd.edu.au>,190 * Allan Creighton <allanc@cs.usyd.edu.au>,
191 * Matthew Geier <matthew@cs.usyd.edu.au>,191 * Matthew Geier <matthew@cs.usyd.edu.au>,
192 * Remo di Giovanni <remo@cs.usyd.edu.au>,192 * 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
2913 if (ret != 0) {2913 if (ret != 0) {
2914 printk(KERN_WARNING2914 printk(KERN_WARNING
2915 "claw: ccw_device_set_online %s WRITE failed "2915 "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),
2917 ret);2917 ret);
2918 goto out;2918 goto out;
2919 }2919 }
include/linux/if_ether.h+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
9 *9 *
10 * Author: Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>10 * Author: Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
11 * Donald Becker, <becker@super.org>11 * Donald Becker, <becker@super.org>
12 * Alan Cox, <alan@redhat.com>12 * Alan Cox, <alan@lxorguk.ukuu.org.uk>
13 * Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>13 * Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>
14 *14 *
15 * This program is free software; you can redistribute it and/or15 * 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
12 * if_fddi.h is based on previous if_ether.h and if_tr.h work by12 * if_fddi.h is based on previous if_ether.h and if_tr.h work by
13 * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>13 * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
14 * Donald Becker, <becker@super.org>14 * Donald Becker, <becker@super.org>
15 * Alan Cox, <alan@redhat.com>15 * Alan Cox, <alan@lxorguk.ukuu.org.uk>
16 * Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>16 * Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>
17 * Peter De Schrijver, <stud11@cc4.kuleuven.ac.be>17 * Peter De Schrijver, <stud11@cc4.kuleuven.ac.be>
18 *18 *
include/linux/if_hippi.h+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
9 *9 *
10 * Author: Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>10 * Author: Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
11 * Donald Becker, <becker@super.org>11 * Donald Becker, <becker@super.org>
12 * Alan Cox, <alan@redhat.com>12 * Alan Cox, <alan@lxorguk.ukuu.org.uk>
13 * Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>13 * Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk>
14 * Jes Sorensen, <Jes.Sorensen@cern.ch>14 * Jes Sorensen, <Jes.Sorensen@cern.ch>
15 *15 *
include/linux/igmp.h+1−1
@@ -2,7 +2,7 @@ · 1 unmodified line
2 * Linux NET3: Internet Group Management Protocol [IGMP]2 * Linux NET3: Internet Group Management Protocol [IGMP]
3 *3 *
4 * Authors:4 * Authors:
5 * Alan Cox <Alan.Cox@linux.org>5 * Alan Cox <alan@lxorguk.ukuu.org.uk>
6 *6 *
7 * Extended to talk the BSD extended IGMP protocol of mrouted 3.67 * Extended to talk the BSD extended IGMP protocol of mrouted 3.6
8 *8 *
include/linux/netdevice.h+1−1
@@ -11,7 +11,7 @@ · 10 unmodified lines
11 * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>11 * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
12 * Corey Minyard <wf-rch!minyard@relay.EU.net>12 * Corey Minyard <wf-rch!minyard@relay.EU.net>
13 * Donald J. Becker, <becker@cesdis.gsfc.nasa.gov>13 * Donald J. Becker, <becker@cesdis.gsfc.nasa.gov>
14 * Alan Cox, <Alan.Cox@linux.org>14 * Alan Cox, <alan@lxorguk.ukuu.org.uk>
15 * Bjorn Ekwall. <bj0rn@blox.se>15 * Bjorn Ekwall. <bj0rn@blox.se>
16 * Pekka Riikonen <priikone@poseidon.pspt.fi>16 * Pekka Riikonen <priikone@poseidon.pspt.fi>
17 *17 *
net/802/psnap.c+1−1
@@ -1,7 +1,7 @@
1/*1/*
2 * SNAP data link layer. Derived from 802.22 * SNAP data link layer. Derived from 802.2
3 *3 *
4 * Alan Cox <Alan.Cox@linux.org>,4 * Alan Cox <alan@lxorguk.ukuu.org.uk>,
5 * from the 802.2 layer by Greg Page.5 * from the 802.2 layer by Greg Page.
6 * Merged in additions from Greg Page's psnap.c.6 * Merged in additions from Greg Page's psnap.c.
7 *7 *
net/appletalk/ddp.c+2−2
@@ -2,7 +2,7 @@ · 1 unmodified line
2 * DDP: An implementation of the AppleTalk DDP protocol for2 * DDP: An implementation of the AppleTalk DDP protocol for
3 * Ethernet 'ELAP'.3 * Ethernet 'ELAP'.
4 *4 *
5 * Alan Cox <Alan.Cox@linux.org>5 * Alan Cox <alan@lxorguk.ukuu.org.uk>
6 *6 *
7 * With more than a little assistance from7 * With more than a little assistance from
8 *8 *
@@ -1934,6 +1934,6 @@ static void __exit atalk_exit(void) · 1925 unmodified lines
1934module_exit(atalk_exit);1934module_exit(atalk_exit);
1935 1935
1936MODULE_LICENSE("GPL");1936MODULE_LICENSE("GPL");
1937MODULE_AUTHOR("Alan Cox <Alan.Cox@linux.org>");1937MODULE_AUTHOR("Alan Cox <alan@lxorguk.ukuu.org.uk>");
1938MODULE_DESCRIPTION("AppleTalk 0.20\n");1938MODULE_DESCRIPTION("AppleTalk 0.20\n");
1939MODULE_ALIAS_NETPROTO(PF_APPLETALK);1939MODULE_ALIAS_NETPROTO(PF_APPLETALK);
net/core/datagram.c+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
9 * identical recvmsg() code. So we share it here. The poll was9 * identical recvmsg() code. So we share it here. The poll was
10 * shared before but buried in udp.c so I moved it.10 * shared before but buried in udp.c so I moved it.
11 *11 *
12 * Authors: Alan Cox <alan@redhat.com>. (datagram_poll() from old12 * Authors: Alan Cox <alan@lxorguk.ukuu.org.uk>. (datagram_poll() from old
13 * udp.c code)13 * udp.c code)
14 *14 *
15 * Fixes:15 * Fixes:
net/core/dev_mcast.c+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
6 * Richard Underwood <richard@wuzz.demon.co.uk>6 * Richard Underwood <richard@wuzz.demon.co.uk>
7 *7 *
8 * Stir fried together from the IP multicast and CAP patches above8 * 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>
10 *10 *
11 * Fixes:11 * Fixes:
12 * Alan Cox : Update the device on a real delete12 * 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
2474 if (ret < 0) {2474 if (ret < 0) {
2475 printk(KERN_ERR "Error expanding "2475 printk(KERN_ERR "Error expanding "
2476 "ipsec packet %d\n",ret);2476 "ipsec packet %d\n",ret);
2477 return 0;2477 goto err;
2478 }2478 }
2479 }2479 }
2480 2480
@@ -2484,8 +2484,7 @@ static inline int process_ipsec(struct pktgen_dev *pkt_dev, · 3 unmodified lines
2484 if (ret) {2484 if (ret) {
2485 printk(KERN_ERR "Error creating ipsec "2485 printk(KERN_ERR "Error creating ipsec "
2486 "packet %d\n",ret);2486 "packet %d\n",ret);
2487 kfree_skb(skb);2487 goto err;
2488 return 0;
2489 }2488 }
2490 /* restore ll */2489 /* restore ll */
2491 eth = (__u8 *) skb_push(skb, ETH_HLEN);2490 eth = (__u8 *) skb_push(skb, ETH_HLEN);
@@ -2494,6 +2493,9 @@ static inline int process_ipsec(struct pktgen_dev *pkt_dev, · 2 unmodified lines
2494 }2493 }
2495 }2494 }
2496 return 1;2495 return 1;
2496err:
2497 kfree_skb(skb);
2498 return 0;
2497}2499}
2498#endif2500#endif
2499 2501
net/core/skbuff.c+1−1
@@ -1,7 +1,7 @@
1/*1/*
2 * Routines having to do with the 'struct sk_buff' memory handlers.2 * Routines having to do with the 'struct sk_buff' memory handlers.
3 *3 *
4 * Authors: Alan Cox <iiitac@pyr.swan.ac.uk>4 * Authors: Alan Cox <alan@lxorguk.ukuu.org.uk>
5 * Florian La Roche <rzsfl@rz.uni-sb.de>5 * Florian La Roche <rzsfl@rz.uni-sb.de>
6 *6 *
7 * Fixes:7 * Fixes:
net/core/stream.c+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
9 *9 *
10 * Authors: Arnaldo Carvalho de Melo <acme@conectiva.com.br>10 * Authors: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
11 * (from old tcp.c code)11 * (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-))
13 */13 */
14 14
15#include <linux/module.h>15#include <linux/module.h>
net/dsa/Kconfig+1−1
@@ -1,7 +1,7 @@
1menuconfig NET_DSA1menuconfig NET_DSA
2 bool "Distributed Switch Architecture support"2 bool "Distributed Switch Architecture support"
3 default n3 default n
4 depends on EXPERIMENTAL4 depends on EXPERIMENTAL && !S390
5 select PHYLIB5 select PHYLIB
6 ---help---6 ---help---
7 This allows you to use hardware switch chips that use7 This allows you to use hardware switch chips that use
net/ipv4/icmp.c+1−1
@@ -1,7 +1,7 @@
1/*1/*
2 * NET3: Implementation of the ICMP protocol layer.2 * NET3: Implementation of the ICMP protocol layer.
3 *3 *
4 * Alan Cox, <alan@redhat.com>4 * Alan Cox, <alan@lxorguk.ukuu.org.uk>
5 *5 *
6 * This program is free software; you can redistribute it and/or6 * This program is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU General Public License7 * modify it under the terms of the GNU General Public License
net/ipv4/igmp.c+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
9 * seems to fall out with gcc 2.6.2.9 * seems to fall out with gcc 2.6.2.
10 *10 *
11 * Authors:11 * Authors:
12 * Alan Cox <Alan.Cox@linux.org>12 * Alan Cox <alan@lxorguk.ukuu.org.uk>
13 *13 *
14 * This program is free software; you can redistribute it and/or14 * This program is free software; you can redistribute it and/or
15 * modify it under the terms of the GNU General Public License15 * 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
6 * The IP fragmentation functionality.6 * The IP fragmentation functionality.
7 *7 *
8 * Authors: Fred N. van Kempen <waltje@uWalt.NL.Mugnet.ORG>8 * 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>
10 *10 *
11 * Fixes:11 * Fixes:
12 * Alan Cox : Split from ip.c , see ip_input.c for history.12 * 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
8 * Authors: Ross Biro8 * Authors: Ross Biro
9 * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>9 * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
10 * Donald Becker, <becker@super.org>10 * Donald Becker, <becker@super.org>
11 * Alan Cox, <Alan.Cox@linux.org>11 * Alan Cox, <alan@lxorguk.ukuu.org.uk>
12 * Richard Underwood12 * Richard Underwood
13 * Stefan Becker, <stefanb@yello.ping.de>13 * Stefan Becker, <stefanb@yello.ping.de>
14 * Jorge Cwik, <jorge@laser.satlink.net>14 * Jorge Cwik, <jorge@laser.satlink.net>
net/ipv4/ipip.c+1−1
@@ -41,7 +41,7 @@ · 40 unmodified lines
41 Made the tunnels use dev->name not tunnel: when error reporting.41 Made the tunnels use dev->name not tunnel: when error reporting.
42 Added tx_dropped stat42 Added tx_dropped stat
43 43
44 -Alan Cox (Alan.Cox@linux.org) 21 March 9544 -Alan Cox (alan@lxorguk.ukuu.org.uk) 21 March 95
45 45
46 Reworked:46 Reworked:
47 Changed to tunnel to destination gateway in addition to the47 Changed to tunnel to destination gateway in addition to the
net/ipv4/ipmr.c+1−1
@@ -1,7 +1,7 @@
1/*1/*
2 * IP multicast routing support for mrouted 3.6/3.82 * IP multicast routing support for mrouted 3.6/3.8
3 *3 *
4 * (c) 1995 Alan Cox, <alan@redhat.com>4 * (c) 1995 Alan Cox, <alan@lxorguk.ukuu.org.uk>
5 * Linux Consultancy and Custom Driver Development5 * Linux Consultancy and Custom Driver Development
6 *6 *
7 * This program is free software; you can redistribute it and/or7 * This program is free software; you can redistribute it and/or
net/ipv4/udp.c+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
8 * Authors: Ross Biro8 * Authors: Ross Biro
9 * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>9 * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
10 * Arnt Gulbrandsen, <agulbra@nvg.unit.no>10 * Arnt Gulbrandsen, <agulbra@nvg.unit.no>
11 * Alan Cox, <Alan.Cox@linux.org>11 * Alan Cox, <alan@lxorguk.ukuu.org.uk>
12 * Hirokazu Takahashi, <taka@valinux.co.jp>12 * Hirokazu Takahashi, <taka@valinux.co.jp>
13 *13 *
14 * Fixes:14 * 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
834 snmp_mib_free((void **)net->mib.icmpv6msg_statistics);834 snmp_mib_free((void **)net->mib.icmpv6msg_statistics);
835}835}
836 836
837static int inet6_net_init(struct net *net)837static int __net_init inet6_net_init(struct net *net)
838{838{
839 int err = 0;839 int err = 0;
840 840
net/netlink/af_netlink.c+1−1
@@ -1,7 +1,7 @@
1/*1/*
2 * NETLINK Kernel-user communication protocol.2 * NETLINK Kernel-user communication protocol.
3 *3 *
4 * Authors: Alan Cox <alan@redhat.com>4 * Authors: Alan Cox <alan@lxorguk.ukuu.org.uk>
5 * Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>5 * Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
6 *6 *
7 * This program is free software; you can redistribute it and/or7 * This program is free software; you can redistribute it and/or
net/sunrpc/xprtsock.c+2−2
@@ -3,8 +3,8 @@ · 2 unmodified lines
3 *3 *
4 * Client-side transport implementation for sockets.4 * Client-side transport implementation for sockets.
5 *5 *
6 * TCP callback races 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 Software <alan@redhat.com>7 * TCP send fixes (C) 1998 Red Hat
8 * TCP NFS related read + write fixes8 * TCP NFS related read + write fixes
9 * (C) 1999 Dave Airlie, University of Limerick, Ireland <airlied@linux.ie>9 * (C) 1999 Dave Airlie, University of Limerick, Ireland <airlied@linux.ie>
10 *10 *
net/unix/af_unix.c+1−1
@@ -1,7 +1,7 @@
1/*1/*
2 * NET4: Implementation of BSD Unix domain sockets.2 * NET4: Implementation of BSD Unix domain sockets.
3 *3 *
4 * Authors: Alan Cox, <alan.cox@linux.org>4 * Authors: Alan Cox, <alan@lxorguk.ukuu.org.uk>
5 *5 *
6 * This program is free software; you can redistribute it and/or6 * This program is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU General Public License7 * modify it under the terms of the GNU General Public License