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

Commit 31083eba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (45 commits)
  [NETFILTER]: xt_time should not assume CONFIG_KTIME_SCALAR
  [NET]: Move unneeded data to initdata section.
  [NET]: Cleanup pernet operation without CONFIG_NET_NS
  [TEHUTI]: Fix incorrect usage of strncat in bdx_get_drvinfo()
  [MYRI_SBUS]: Prevent that myri_do_handshake lies about ticks.
  [NETFILTER]: bridge: fix double POSTROUTING hook invocation
  [NETFILTER]: Consolidate nf_sockopt and compat_nf_sockopt
  [NETFILTER]: nf_nat: fix memset error
  [INET]: Use list_head-s in inetpeer.c
  [IPVS]: Remove unused exports.
  [NET]: Unexport sysctl_{r,w}mem_max.
  [TG3]: Update version to 3.86
  [TG3]: MII => TP
  [TG3]: Add A1 revs
  [TG3]: Increase the PCI MRRS
  [TG3]: Prescaler fix
  [TG3]: Limit 5784 / 5764 to MAC LED mode
  [TG3]: Disable GPHY autopowerdown
  [TG3]: CPMU adjustments for loopback tests
  [TG3]: Fix nvram selftest failures
  ...
parents a7fe7716 53756524

Documentation/networking/3c505.txt

+1 −2
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ If no base address is given at boot time, the driver will autoprobe 
ports 0x300, 0x280 and 0x310 (in that order).  If no IRQ is given, the driver

will try to probe for it.



The driver can be used as a loadable module.  See net-modules.txt for details

of the parameters it can take.  

The driver can be used as a loadable module.



Theoretically, one instance of the driver can now run multiple cards,

in the standard way (when loading a module, say "modprobe 3c505

drivers/block/nbd.c

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/err.h>

#include <linux/kernel.h>

#include <net/sock.h>

#include <linux/net.h>



#include <asm/uaccess.h>

#include <asm/system.h>
@@ -126,7 +127,7 @@ static void sock_shutdown(struct nbd_device *lo, int lock) 
	if (lo->sock) {

		printk(KERN_WARNING "%s: shutting down socket\n",

			lo->disk->disk_name);

		lo->sock->ops->shutdown(lo->sock, SEND_SHUTDOWN|RCV_SHUTDOWN);

		kernel_sock_shutdown(lo->sock, SHUT_RDWR);

		lo->sock = NULL;

	}

	if (lock)

drivers/net/Kconfig

+69 −130

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/arcnet/Kconfig

+5 −10
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ menuconfig ARCNET 
	  from <http://www.tldp.org/docs.html#howto>(even though ARCnet

	  is not really Ethernet).



	  To compile this driver as a module, choose M here and read

	  <file:Documentation/networking/net-modules.txt>.  The module will

	  To compile this driver as a module, choose M here. The module will

	  be called arcnet.



if ARCNET
@@ -81,8 +80,7 @@ config ARCNET_COM90xx 
	  have always used the old ARCnet driver without knowing what type of

	  card you had, this is probably the one for you.



	  To compile this driver as a module, choose M here and read

	  <file:Documentation/networking/net-modules.txt>.  The module will

	  To compile this driver as a module, choose M here. The module will

	  be called com90xx.



config ARCNET_COM90xxIO
@@ -93,8 +91,7 @@ config ARCNET_COM90xxIO 
	  the normal driver. Only use it if your card doesn't support shared

	  memory.



	  To compile this driver as a module, choose M here and read

	  <file:Documentation/networking/net-modules.txt>.  The module will

	  To compile this driver as a module, choose M here. The module will

	  be called com90io.



config ARCNET_RIM_I
@@ -105,8 +102,7 @@ config ARCNET_RIM_I 
	  driver is completely untested, so if you have one of these cards,

	  please mail <dwmw2@infradead.org>, especially if it works!



	  To compile this driver as a module, choose M here and read

	  <file:Documentation/networking/net-modules.txt>.  The module will

	  To compile this driver as a module, choose M here. The module will

	  be called arc-rimi.



config ARCNET_COM20020
@@ -116,8 +112,7 @@ config ARCNET_COM20020 
	  things as promiscuous mode, so packet sniffing is possible, and

	  extra diagnostic information.



	  To compile this driver as a module, choose M here and read

	  <file:Documentation/networking/net-modules.txt>.  The module will

	  To compile this driver as a module, choose M here. The module will

	  be called com20020.



config ARCNET_COM20020_ISA

drivers/net/loopback.c

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static __net_exit void loopback_net_exit(struct net *net) 
	unregister_netdev(dev);

}



static struct pernet_operations loopback_net_ops = {

static struct pernet_operations __net_initdata loopback_net_ops = {

       .init = loopback_net_init,

       .exit = loopback_net_exit,

};