Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (e5dfa928) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/networking/bonding.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -777,7 +777,7 @@ doing so is the same as described in the "Configuring Multiple Bonds
		Manually" section, below.

		NOTE: It has been observed that some Red Hat supplied kernels
		are apparently unable to rename modules at load time (the "-obonding1"
		are apparently unable to rename modules at load time (the "-o bond1"
		part). Attempts to pass that option to modprobe will produce an
		"Operation not permitted" error. This has been reported on some
		Fedora Core kernels, and has been seen on RHEL 4 as well. On kernels
		@@ -883,7 +883,8 @@ the above does not work, and the second bonding instance never sees
		its options. In that case, the second options line can be substituted
		as follows:

		install bonding1 /sbin/modprobe bonding -obond1 mode=balance-alb miimon=50
		install bond1 /sbin/modprobe --ignore-install bonding -o bond1 \
		mode=balance-alb miimon=50

		This may be repeated any number of times, specifying a new and
		unique name in place of bond1 for each subsequent instance.

+3 −2

Original line number	Diff line number	Diff line
		@@ -1027,8 +1027,7 @@ static void cp_reset_hw (struct cp_private *cp)
		if (!(cpr8(Cmd) & CmdReset))
		return;

		set_current_state(TASK_UNINTERRUPTIBLE);
		schedule_timeout(10);
		schedule_timeout_uninterruptible(10);
		}

		printk(KERN_ERR "%s: hardware reset timeout\n", cp->dev->name);
		@@ -1575,6 +1574,7 @@ static struct ethtool_ops cp_ethtool_ops = {
		.set_wol = cp_set_wol,
		.get_strings = cp_get_strings,
		.get_ethtool_stats = cp_get_ethtool_stats,
		.get_perm_addr = ethtool_op_get_perm_addr,
		};

		static int cp_ioctl (struct net_device dev, struct ifreq rq, int cmd)
		@@ -1773,6 +1773,7 @@ static int cp_init_one (struct pci_dev pdev, const struct pci_device_id ent)
		for (i = 0; i < 3; i++)
		((u16 *) (dev->dev_addr))[i] =
		le16_to_cpu (read_eeprom (regs, i + 7, addr_len));
		memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);

		dev->open = cp_open;
		dev->stop = cp_close;

+4 −1

Original line number	Diff line number	Diff line
		@@ -552,7 +552,8 @@ const static struct {

		{ "RTL-8100B/8139D",
		HW_REVID(1, 1, 1, 0, 1, 0, 1),
		HasLWake,
		HasHltClk /* XXX undocumented? */
		\| HasLWake,
		},

		{ "RTL-8101",
		@@ -970,6 +971,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
		for (i = 0; i < 3; i++)
		((u16 *) (dev->dev_addr))[i] =
		le16_to_cpu (read_eeprom (ioaddr, i + 7, addr_len));
		memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);

		/* The Rtl8139-specific entries in the device structure. */
		dev->open = rtl8139_open;
		@@ -2465,6 +2467,7 @@ static struct ethtool_ops rtl8139_ethtool_ops = {
		.get_strings = rtl8139_get_strings,
		.get_stats_count = rtl8139_get_stats_count,
		.get_ethtool_stats = rtl8139_get_ethtool_stats,
		.get_perm_addr = ethtool_op_get_perm_addr,
		};

		static int netdev_ioctl(struct net_device dev, struct ifreq rq, int cmd)

+23 −0

Original line number	Diff line number	Diff line
		@@ -475,6 +475,14 @@ config SGI_IOC3_ETH_HW_TX_CSUM
		the moment only acceleration of IPv4 is supported. This option
		enables offloading for checksums on transmit. If unsure, say Y.

		config MIPS_SIM_NET
		tristate "MIPS simulator Network device (EXPERIMENTAL)"
		depends on NETDEVICES && MIPS_SIM && EXPERIMENTAL
		help
		The MIPSNET device is a simple Ethernet network device which is
		emulated by the MIPS Simulator.
		If you are not using a MIPSsim or are unsure, say N.

		config SGI_O2MACE_ETH
		tristate "SGI O2 MACE Fast Ethernet support"
		depends on NET_ETHERNET && SGI_IP32=y
		@@ -2083,6 +2091,7 @@ config SPIDER_NET
		config GIANFAR
		tristate "Gianfar Ethernet"
		depends on 85xx \|\| 83xx
		select PHYLIB
		help
		This driver supports the Gigabit TSEC on the MPC85xx
		family of chips, and the FEC on the 8540
		@@ -2243,6 +2252,20 @@ config ISERIES_VETH
		tristate "iSeries Virtual Ethernet driver support"
		depends on PPC_ISERIES

		config RIONET
		tristate "RapidIO Ethernet over messaging driver support"
		depends on NETDEVICES && RAPIDIO

		config RIONET_TX_SIZE
		int "Number of outbound queue entries"
		depends on RIONET
		default "128"

		config RIONET_RX_SIZE
		int "Number of inbound queue entries"
		depends on RIONET
		default "128"

		config FDDI
		bool "FDDI driver support"
		depends on (PCI \|\| EISA)

+3 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ obj-$(CONFIG_CHELSIO_T1) += chelsio/
		obj-$(CONFIG_BONDING) += bonding/
		obj-$(CONFIG_GIANFAR) += gianfar_driver.o

		gianfar_driver-objs := gianfar.o gianfar_ethtool.o gianfar_phy.o
		gianfar_driver-objs := gianfar.o gianfar_ethtool.o gianfar_mii.o

		#
		# link order important here
		@@ -64,6 +64,7 @@ obj-$(CONFIG_SKFP) += skfp/
		obj-$(CONFIG_VIA_RHINE) += via-rhine.o
		obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o
		obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
		obj-$(CONFIG_RIONET) += rionet.o

		#
		# end link order section
		@@ -166,6 +167,7 @@ obj-$(CONFIG_EQUALIZER) += eql.o
		obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
		obj-$(CONFIG_MIPS_GT96100ETH) += gt96100eth.o
		obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
		obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
		obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
		obj-$(CONFIG_DECLANCE) += declance.o
		obj-$(CONFIG_ATARILANCE) += atarilance.o