Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43096597 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 79aa79ba 48501371

drivers/isdn/mISDN/dsp_cmx.c

+2 −2
Original line number Diff line number Diff line
@@ -452,10 +452,10 @@ one_member: 
			if (finddsp->features.pcm_id == dsp->features.pcm_id) {

				if (finddsp->pcm_slot_rx >= 0 &&

				    finddsp->pcm_slot_rx < sizeof(freeslots))

					freeslots[finddsp->pcm_slot_tx] = 0;

					freeslots[finddsp->pcm_slot_rx] = 0;

				if (finddsp->pcm_slot_tx >= 0 &&

				    finddsp->pcm_slot_tx < sizeof(freeslots))

					freeslots[finddsp->pcm_slot_rx] = 0;

					freeslots[finddsp->pcm_slot_tx] = 0;

			}

		}

		i = 0;

drivers/isdn/mISDN/timerdev.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ mISDN_open(struct inode *ino, struct file *filep) 
	init_waitqueue_head(&dev->wait);

	filep->private_data = dev;

	__module_get(THIS_MODULE);

	return 0;

	return nonseekable_open(ino, filep);

}



static int

drivers/net/3c501.c

+6 −6
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
	Annapolis MD 21403



    Fixed (again!) the missing interrupt locking on TX/RX shifting.

	Alan Cox <Alan.Cox@linux.org>

	Alan Cox <alan@lxorguk.ukuu.org.uk>



    Removed calls to init_etherdev since they are no longer needed, and

    cleaned up modularization just a bit. The driver still allows only
@@ -29,16 +29,16 @@ 
    the board. Now getting 150K/second FTP with a 3c501 card. Still playing

    with a TX-TX optimisation to see if we can touch 180-200K/second as seems

    theoretically maximum.

		19950402 Alan Cox <Alan.Cox@linux.org>

		19950402 Alan Cox <alan@lxorguk.ukuu.org.uk>



    Cleaned up for 2.3.x because we broke SMP now.

		20000208 Alan Cox <alan@redhat.com>

		20000208 Alan Cox <alan@lxorguk.ukuu.org.uk>



    Check up pass for 2.5. Nothing significant changed

		20021009 Alan Cox <alan@redhat.com>

		20021009 Alan Cox <alan@lxorguk.ukuu.org.uk>



    Fixed zero fill corner case

		20030104 Alan Cox <alan@redhat.com>

		20030104 Alan Cox <alan@lxorguk.ukuu.org.uk>





   For the avoidance of doubt the "preferred form" of this code is one which
@@ -104,7 +104,7 @@ 




static const char version[] =

	DRV_NAME ".c: " DRV_VERSION " Alan Cox (alan@redhat.com).\n";

	DRV_NAME ".c: " DRV_VERSION " Alan Cox (alan@lxorguk.ukuu.org.uk).\n";



/*

 *	Braindamage remaining:

drivers/net/3c515.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


	2001/11/17 - Added ethtool support (jgarzik)



	2002/10/28 - Locking updates for 2.5 (alan@redhat.com)

	2002/10/28 - Locking updates for 2.5 (alan@lxorguk.ukuu.org.uk)



*/

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2400,7 +2400,7 @@ config EHEA 
	  will be called ehea.



config ENIC

	tristate "E, the Cisco 10G Ethernet NIC"

	tristate "Cisco 10G Ethernet NIC support"

	depends on PCI && INET

	select INET_LRO

	help