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

Commit 219ff3ad 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: (79 commits)
  [X25]: Use proc_create() to setup ->proc_fops first
  [WANROUTER]: Use proc_create() to setup ->proc_fops first
  [8021Q]: Use proc_create() to setup ->proc_fops first
  [IPV4]: Use proc_create() to setup ->proc_fops first
  [IPV6]: Use proc_create() to setup ->proc_fops first
  [SCTP]: Use proc_create() to setup ->proc_fops first
  [PKTGEN]: Use proc_create() to setup ->proc_fops first
  [NEIGHBOUR]: Use proc_create() to setup ->proc_fops first
  [LLC]: Use proc_create() to setup ->proc_fops first
  [IPX]: Use proc_create() to setup ->proc_fops first
  [SUNRPC]: Use proc_create() to setup ->proc_fops first
  [ATM]: Use proc_create() to setup ->proc_fops first
  [SCTP]: Update AUTH structures to match declarations in draft-16.
  [SCTP]: Incorrect length was used in SCTP_*_AUTH_CHUNKS socket option
  [SCTP]: Clean up naming conventions of sctp protocol/address family registration
  [APPLETALK]: Use proc_create() to setup ->proc_fops first
  [BNX2X]: add bnx2x to MAINTAINERS
  [BNX2X]: update version, remove CVS strings
  [BNX2X]: Fix Xmit bugs
  [BNX2X]: Prevent PCI queue overflow
  ...
parents 547598d3 2335f8ec

MAINTAINERS

+13 −4
Original line number Original line Diff line number Diff line
@@ -982,6 +982,12 @@ M: mchan@broadcom.com 
L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

S:	Supported

S:	Supported





BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER

P:	Eliezer Tamir

M:	eliezert@broadcom.com

L:	netdev@vger.kernel.org

S:	Supported



BROADCOM TG3 GIGABIT ETHERNET DRIVER

BROADCOM TG3 GIGABIT ETHERNET DRIVER

P:	Michael Chan

P:	Michael Chan

M:	mchan@broadcom.com

M:	mchan@broadcom.com
@@ -3886,10 +3892,13 @@ M: trivial@kernel.org 
L:	linux-kernel@vger.kernel.org

L:	linux-kernel@vger.kernel.org

S:	Maintained

S:	Maintained





TULIP NETWORK DRIVER

TULIP NETWORK DRIVERS

L:	tulip-users@lists.sourceforge.net

P:	Grant Grundler

W:	http://sourceforge.net/projects/tulip/

M:	grundler@parisc-linux.org

S:	Orphan

P:	Kyle McMartin

M:	kyle@parisc-linux.org

L:	netdev@vger.kernel.org

S:	Maintained





TUN/TAP driver

TUN/TAP driver

P:	Maxim Krasnyansky

P:	Maxim Krasnyansky

drivers/connector/connector.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ static LIST_HEAD(notify_list); 




static struct cn_dev cdev;

static struct cn_dev cdev;





int cn_already_initialized = 0;

static int cn_already_initialized;





/*

/*

 * msg->seq and msg->ack are used to determine message genealogy.

 * msg->seq and msg->ack are used to determine message genealogy.

drivers/net/Kconfig

+6 −0
Original line number Original line Diff line number Diff line
@@ -90,6 +90,11 @@ config MACVLAN 
	  This allows one to create virtual interfaces that map packets to

	  This allows one to create virtual interfaces that map packets to

	  or from specific MAC addresses to a particular interface.

	  or from specific MAC addresses to a particular interface.





	  Macvlan devices can be added using the "ip" command from the

	  iproute2 package starting with the iproute2-2.6.23 release:



	  "ip link add link <real dev> [ address MAC ] [ NAME ] type macvlan"



	  To compile this driver as a module, choose M here: the module

	  To compile this driver as a module, choose M here: the module

	  will be called macvlan.

	  will be called macvlan.
@@ -2363,6 +2368,7 @@ config GELIC_NET 
config GELIC_WIRELESS

config GELIC_WIRELESS

       bool "PS3 Wireless support"

       bool "PS3 Wireless support"

       depends on GELIC_NET

       depends on GELIC_NET

       select WIRELESS_EXT

       help

       help

        This option adds the support for the wireless feature of PS3.

        This option adds the support for the wireless feature of PS3.

        If you have the wireless-less model of PS3 or have no plan to

        If you have the wireless-less model of PS3 or have no plan to