Commit df0b4a50 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: (29 commits)
  p54: fix race condition in memory management
  cfg80211: test before subtraction on unsigned
  iwlwifi: fix error flow in iwl*_pci_probe
  rt2x00 : more devices to rt73usb.c
  rt2x00 : more devices to rt2500usb.c
  bonding: Fix device passed into ->ndo_neigh_setup().
  vlan: Fix vlan-in-vlan crashes.
  net: Fix missing dev->neigh_setup in register_netdevice().
  tmspci: fix request_irq race
  pkt_sched: act_police: Fix a rate estimator test.
  tg3: Fix 5906 link problems
  SCTP: change sctp_ctl_sock_init() to try IPv4 if IPv6 fails
  IPv6: add "disable" module parameter support to ipv6.ko
  sungem: another error printed one too early
  aoe: error printed 1 too early
  net pcmcia: worklimit reaches -1
  net: more timeouts that reach -1
  net: fix tokenring license
  dm9601: new vendor/product IDs
  netlink: invert error code in netlink_set_err()
  ...
parents 39a3478c c0350024

Documentation/networking/ipv6.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 


Options for the ipv6 module are supplied as parameters at load time.



Module options may be given as command line arguments to the insmod

or modprobe command, but are usually specified in either the

/etc/modules.conf or /etc/modprobe.conf configuration file, or in a

distro-specific configuration file.



The available ipv6 module parameters are listed below.  If a parameter

is not specified the default value is used.



The parameters are as follows:



disable



	Specifies whether to load the IPv6 module, but disable all

	its functionality.  This might be used when another module

	has a dependency on the IPv6 module being loaded, but no

	IPv6 addresses or operations are desired.



	The possible values and their effects are:



	0

		IPv6 is enabled.



		This is the default value.



	1

		IPv6 is disabled.



		No IPv6 addresses will be added to interfaces, and

		it will not be possible to open an IPv6 socket.



		A reboot is required to enable IPv6.

arch/arm/mach-omap2/board-ldp.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static inline void __init ldp_init_smc911x(void) 
	}



	ldp_smc911x_resources[0].start = cs_mem_base + 0x0;

	ldp_smc911x_resources[0].end   = cs_mem_base + 0xf;

	ldp_smc911x_resources[0].end   = cs_mem_base + 0xff;

	udelay(100);



	eth_gpio = LDP_SMC911X_GPIO;

drivers/block/aoe/aoedev.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ skbfree(struct sk_buff *skb) 
		return;

	while (atomic_read(&skb_shinfo(skb)->dataref) != 1 && i-- > 0)

		msleep(Sms);

	if (i <= 0) {

	if (i < 0) {

		printk(KERN_ERR

			"aoe: %s holds ref: %s\n",

			skb->dev ? skb->dev->name : "netif",

drivers/net/arm/ks8695net.c

+1 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ ks8695_reset(struct ks8695_priv *ksp) 
		msleep(1);

	}



	if (reset_timeout == 0) {

	if (reset_timeout < 0) {

		dev_crit(ksp->dev,

			 "Timeout waiting for DMA engines to reset\n");

		/* And blithely carry on */

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -4113,7 +4113,7 @@ static int bond_neigh_setup(struct net_device *dev, struct neigh_parms *parms) 
		const struct net_device_ops *slave_ops

			= slave->dev->netdev_ops;

		if (slave_ops->ndo_neigh_setup)

			return slave_ops->ndo_neigh_setup(dev, parms);

			return slave_ops->ndo_neigh_setup(slave->dev, parms);

	}

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE