Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (75e47b36) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/net/Kconfig

+9 −9

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ config BONDING
		'Trunking' by Sun, 802.3ad by the IEEE, and 'Bonding' in Linux.

		The driver supports multiple bonding modes to allow for both high
		perfomance and high availability operation.
		performance and high availability operation.

		Refer to <file:Documentation/networking/bonding.txt> for more
		information.
		@@ -698,8 +698,8 @@ config VORTEX
		depends on NET_VENDOR_3COM && (PCI \|\| EISA)
		select MII
		---help---
		This option enables driver support for a large number of 10mbps and
		10/100mbps EISA, PCI and PCMCIA 3Com network cards:
		This option enables driver support for a large number of 10Mbps and
		10/100Mbps EISA, PCI and PCMCIA 3Com network cards:

		"Vortex" (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI
		"Boomerang" (EtherLink XL 3c900 or 3c905) PCI
		@@ -1021,7 +1021,7 @@ config EEXPRESS_PRO
		depends on NET_ISA
		---help---
		If you have a network (Ethernet) card of this type, say Y. This
		driver supports intel i82595{FX,TX} based boards. Note however
		driver supports Intel i82595{FX,TX} based boards. Note however
		that the EtherExpress PRO/100 Ethernet card has its own separate
		driver. Please read the Ethernet-HOWTO, available from
		<http://www.tldp.org/docs.html#howto>.
		@@ -1207,7 +1207,7 @@ config IBM_EMAC_RX_SKB_HEADROOM
		help
		Additional receive skb headroom. Note, that driver
		will always reserve at least 2 bytes to make IP header
		aligned, so usualy there is no need to add any additional
		aligned, so usually there is no need to add any additional
		headroom.

		If unsure, set to 0.
		@@ -1933,7 +1933,7 @@ config MYRI_SBUS
		will be called myri_sbus. This is recommended.

		config NS83820
		tristate "National Semiconduct DP83820 support"
		tristate "National Semiconductor DP83820 support"
		depends on PCI
		help
		This is a driver for the National Semiconductor DP83820 series
		@@ -2513,7 +2513,7 @@ config PPP_FILTER
		Say Y here if you want to be able to filter the packets passing over
		PPP interfaces. This allows you to control which packets count as
		activity (i.e. which packets will reset the idle timer or bring up
		a demand-dialled link) and which packets are to be dropped entirely.
		a demand-dialed link) and which packets are to be dropped entirely.
		You need to say Y here if you wish to use the pass-filter and
		active-filter options to pppd.

		@@ -2701,8 +2701,8 @@ config SHAPER
		<file:Documentation/networking/shaper.txt> for more information.

		An alternative to this traffic shaper is the experimental
		Class-Based Queueing (CBQ) scheduling support which you get if you
		say Y to "QoS and/or fair queueing" above.
		Class-Based Queuing (CBQ) scheduling support which you get if you
		say Y to "QoS and/or fair queuing" above.

		To compile this driver as a module, choose M here: the module
		will be called shaper. If unsure, say N.

drivers/net/arcnet/Kconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -68,10 +68,10 @@ config ARCNET_CAP
		packet is stuffed with an extra 4 byte "cookie" which doesn't
		actually appear on the network. After transmit the driver will send
		back a packet with protocol byte 0 containing the status of the
		transmition:
		transmission:
		0=no hardware acknowledge
		1=excessive nak
		2=transmition accepted by the reciever hardware
		2=transmission accepted by the receiver hardware

		Received packets are also stuffed with the extra 4 bytes but it will
		be random data.

drivers/net/irda/Kconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -283,7 +283,7 @@ config USB_IRDA
		Say Y here if you want to build support for the USB IrDA FIR Dongle
		device driver. To compile it as a module, choose M here: the module
		will be called irda-usb. IrDA-USB support the various IrDA USB
		dongles available and most of their pecularities. Those dongles
		dongles available and most of their peculiarities. Those dongles
		plug in the USB port of your computer, are plug and play, and
		support SIR and FIR (4Mbps) speeds. On the other hand, those
		dongles tend to be less efficient than a FIR chipset.
		@@ -360,7 +360,7 @@ config ALI_FIR
		help
		Say Y here if you want to build support for the ALi M5123 FIR
		Controller. The ALi M5123 FIR Controller is embedded in ALi M1543C,
		M1535, M1535D, M1535+, M1535D Sourth Bridge. This driver supports
		M1535, M1535D, M1535+, M1535D South Bridge. This driver supports
		SIR, MIR and FIR (4Mbps) speeds.

		To compile it as a module, choose M here: the module will be called

drivers/net/wan/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -459,7 +459,7 @@ config WANPIPE_FR
		bool "WANPIPE Frame Relay support"
		depends on VENDOR_SANGOMA
		help
		Connect a WANPIPE card to a Frame Relay network, or use Frame Felay
		Connect a WANPIPE card to a Frame Relay network, or use Frame Relay
		API to develop custom applications.

		Contains the Ethernet Bridging over Frame Relay feature, where

drivers/net/wireless/Kconfig

+20 −5

Original line number	Diff line number	Diff line
		@@ -136,8 +136,9 @@ comment "Wireless 802.11b ISA/PCI cards support"

		config IPW2100
		tristate "Intel PRO/Wireless 2100 Network Connection"
		depends on NET_RADIO && PCI && IEEE80211
		depends on NET_RADIO && PCI
		select FW_LOADER
		select IEEE80211
		---help---
		A driver for the Intel PRO/Wireless 2100 Network
		Connection 802.11b wireless network adapter.
		@@ -189,8 +190,9 @@ config IPW2100_DEBUG

		config IPW2200
		tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
		depends on NET_RADIO && IEEE80211 && PCI
		depends on NET_RADIO && PCI
		select FW_LOADER
		select IEEE80211
		---help---
		A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network
		Connection adapters.
		@@ -202,7 +204,7 @@ config IPW2200
		In order to use this driver, you will need a firmware image for it.
		You can obtain the firmware from
		<http://ipw2200.sf.net/>. See the above referenced README.ipw2200
		for information on where to install the firmare images.
		for information on where to install the firmware images.

		You will also very likely need the Wireless Tools in order to
		configure your card:
		@@ -214,6 +216,19 @@ config IPW2200
		say M here and read <file:Documentation/modules.txt>. The module
		will be called ipw2200.ko.

		config IPW2200_MONITOR
		bool "Enable promiscuous mode"
		depends on IPW2200
		---help---
		Enables promiscuous/monitor mode support for the ipw2200 driver.
		With this feature compiled into the driver, you can switch to
		promiscuous mode via the Wireless Tool's Monitor mode. While in this
		mode, no packets can be sent.

		config IPW_QOS
		bool "Enable QoS support"
		depends on IPW2200 && EXPERIMENTAL

		config IPW2200_DEBUG
		bool "Enable full debugging output in IPW2200 module."
		depends on IPW2200
		@@ -247,7 +262,7 @@ config AIRO
		PCI 802.11 wireless cards.
		It supports the new 802.11b cards from Cisco (Cisco 34X, Cisco 35X
		- with or without encryption) as well as card before the Cisco
		aquisition (Aironet 4500, Aironet 4800, Aironet 4800B).
		acquisition (Aironet 4500, Aironet 4800, Aironet 4800B).

		This driver support both the standard Linux Wireless Extensions
		and Cisco proprietary API, so both the Linux Wireless Tools and the
		@@ -396,7 +411,7 @@ config AIRO_CS
		driver part of the Linux Pcmcia package.
		It supports the new 802.11b cards from Cisco (Cisco 34X, Cisco 35X
		- with or without encryption) as well as card before the Cisco
		aquisition (Aironet 4500, Aironet 4800, Aironet 4800B). It also
		acquisition (Aironet 4500, Aironet 4800, Aironet 4800B). It also
		supports OEM of Cisco such as the DELL TrueMobile 4800 and Xircom
		802.11b cards.