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

Commit 167c6274 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents 5c7f0333 a8272061
Loading
Loading
Loading
Loading
+52 −0
Original line number Diff line number Diff line
@@ -194,6 +194,48 @@ or, for backwards compatibility, the option value. E.g.,

	The parameters are as follows:

ad_select

	Specifies the 802.3ad aggregation selection logic to use.  The
	possible values and their effects are:

	stable or 0

		The active aggregator is chosen by largest aggregate
		bandwidth.

		Reselection of the active aggregator occurs only when all
		slaves of the active aggregator are down or the active
		aggregator has no slaves.

		This is the default value.

	bandwidth or 1

		The active aggregator is chosen by largest aggregate
		bandwidth.  Reselection occurs if:

		- A slave is added to or removed from the bond

		- Any slave's link state changes

		- Any slave's 802.3ad association state changes

		- The bond's adminstrative state changes to up

	count or 2

		The active aggregator is chosen by the largest number of
		ports (slaves).  Reselection occurs as described under the
		"bandwidth" setting, above.

	The bandwidth and count selection policies permit failover of
	802.3ad aggregations when partial failure of the active aggregator
	occurs.  This keeps the aggregator with the highest availability
	(either in bandwidth or in number of ports) active at all times.

	This option was added in bonding version 3.4.0.

arp_interval

	Specifies the ARP link monitoring frequency in milliseconds.
@@ -551,6 +593,16 @@ num_grat_arp
	affects only the active-backup mode.  This option was added for
	bonding version 3.3.0.

num_unsol_na

	Specifies the number of unsolicited IPv6 Neighbor Advertisements
	to be issued after a failover event.  One unsolicited NA is issued
	immediately after the failover.

	The valid range is 0 - 255; the default value is 1.  This option
	affects only the active-backup mode.  This option was added for
	bonding version 3.4.0.

primary

	A string (eth0, eth2, etc) specifying which slave is the
+6 −0
Original line number Diff line number Diff line
@@ -3853,6 +3853,12 @@ M: mhoffman@lightlink.com
L:	lm-sensors@lm-sensors.org
S:	Maintained

SMSC911x ETHERNET DRIVER
P:	Steve Glendinning
M:	steve.glendinning@smsc.com
L:	netdev@vger.kernel.org
S:	Supported

SMX UIO Interface
P:	Ben Nizette
M:	bn@niasdigital.com
+15 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ config DUMMY
config BONDING
	tristate "Bonding driver support"
	depends on INET
	depends on IPV6 || IPV6=n
	---help---
	  Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet
	  Channels together. This is called 'Etherchannel' by Cisco,
@@ -978,6 +979,20 @@ config SMC911X
	  called smc911x.  If you want to compile it as a module, say M 
	  here and read <file:Documentation/kbuild/modules.txt>

config SMSC911X
	tristate "SMSC LAN911x/LAN921x families embedded ethernet support"
	depends on ARM || SUPERH
	select CRC32
	select MII
	select PHYLIB
	---help---
	  Say Y here if you want support for SMSC LAN911x and LAN921x families
	  of ethernet controllers.

	  To compile this driver as a module, choose M here and read
	  <file:Documentation/networking/net-modules.txt>. The module
	  will be called smsc911x.

config NET_VENDOR_RACAL
	bool "Racal-Interlan (Micom) NI cards"
	depends on ISA
+1 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ obj-$(CONFIG_S2IO) += s2io.o
obj-$(CONFIG_MYRI10GE) += myri10ge/
obj-$(CONFIG_SMC91X) += smc91x.o
obj-$(CONFIG_SMC911X) += smc911x.o
obj-$(CONFIG_SMSC911X) += smsc911x.o
obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
obj-$(CONFIG_DM9000) += dm9000.o
obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o
+3 −0
Original line number Diff line number Diff line
@@ -6,3 +6,6 @@ obj-$(CONFIG_BONDING) += bonding.o

bonding-objs := bond_main.o bond_3ad.o bond_alb.o bond_sysfs.o

ipv6-$(subst m,y,$(CONFIG_IPV6)) += bond_ipv6.o
bonding-objs += $(ipv6-y)
Loading