Commit 9abbf7d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (21 commits)
  Fix build break in tsi108.c
  qeth: remove header_ops bug
  ir-functions.c:(.text+0xbce18): undefined reference to `input_event'
  NAPI: kconfig prompt and deleted doc file
  phy/bitbang: missing MODULE_LICENSE
  DM9000 initialization fix
  [PATCH] rt2x00: Add new rt73usb USB ID
  [PATCH] rt2x00: Fix residual check in PLCP calculations.
  [PATCH] iwlwifi: Fix rate setting in probe request for HW sacn
  [PATCH] b43: Make b43_stop() static
  [PATCH] drivers/net/wireless/b43/main.c: fix an uninitialized variable
  [PATCH] iwlwifi: set correct base rate for A band in rs_dbgfs_set_mcs
  [PATCH] zd1211rw, fix oops when ejecting install media
  [PATCH] b43legacy: Fix potential return of uninitialized variable
  [PATCH] iwl4965-base.c: fix off-by-one errors
  [PATCH] p54: Make filter configuration atomic
  [PATCH] rtl8187: remove NICMAC setting in configure_filters callback
  [PATCH] janitorial: fix all double includes in drivers/net/wireless
  [PATCH] rtl8187: Fix more frag bit checking, rts duration calc
  [PATCH] ipw2100: send WEXT scan events
  ...
parents b3d9d6be fe252009

drivers/net/Kconfig

+7 −34
Original line number Diff line number Diff line
@@ -1293,9 +1293,6 @@ config PCNET32_NAPI 
	  deployed on potentially unfriendly networks (e.g. in a firewall),

	  then say Y here.



	  See <file:Documentation/networking/NAPI_HOWTO.txt> for more

	  information.



	  If in doubt, say N.



config AMD8111_ETH
@@ -1313,7 +1310,7 @@ config AMD8111_ETH 
	  will be called amd8111e.



config AMD8111E_NAPI

	bool "Enable NAPI support"

	bool "Use RX polling (NAPI)"

	depends on AMD8111_ETH

	help

	  NAPI is a new driver API designed to reduce CPU and interrupt load
@@ -1324,9 +1321,6 @@ config AMD8111E_NAPI 
	  deployed on potentially unfriendly networks (e.g. in a firewall),

	  then say Y here.



	  See <file:Documentation/networking/NAPI_HOWTO.txt> for more

	  information.



	  If in doubt, say N.



config ADAPTEC_STARFIRE
@@ -1355,9 +1349,6 @@ config ADAPTEC_STARFIRE_NAPI 
	  deployed on potentially unfriendly networks (e.g. in a firewall),

	  then say Y here.



	  See <file:Documentation/networking/NAPI_HOWTO.txt> for more

	  information.



	  If in doubt, say N.



config AC3200
@@ -1431,7 +1422,7 @@ config FORCEDETH 
	  called forcedeth.



config FORCEDETH_NAPI

	bool "Use Rx and Tx Polling (NAPI) (EXPERIMENTAL)"

	bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"

	depends on FORCEDETH && EXPERIMENTAL

	help

	  NAPI is a new driver API designed to reduce CPU and interrupt load
@@ -1442,9 +1433,6 @@ config FORCEDETH_NAPI 
	  deployed on potentially unfriendly networks (e.g. in a firewall),

	  then say Y here.



	  See <file:Documentation/networking/NAPI_HOWTO.txt> for more

	  information.



	  If in doubt, say N.



config CS89x0
@@ -1756,9 +1744,6 @@ config VIA_RHINE_NAPI 
	  deployed on potentially unfriendly networks (e.g. in a firewall),

	  then say Y here.



	  See <file:Documentation/networking/NAPI_HOWTO.txt> for more

	  information.



config LAN_SAA9730

	bool "Philips SAA9730 Ethernet support"

	depends on NET_PCI && PCI && MIPS_ATLAS
@@ -2003,9 +1988,6 @@ config E1000_NAPI 
	  deployed on potentially unfriendly networks (e.g. in a firewall),

	  then say Y here.



	  See <file:Documentation/networking/NAPI_HOWTO.txt> for more

	  information.



	  If in doubt, say N.



config E1000_DISABLE_PACKET_SPLIT
@@ -2099,7 +2081,7 @@ config R8169 
	  will be called r8169.  This is recommended.



config R8169_NAPI

	bool "Use Rx and Tx Polling (NAPI) (EXPERIMENTAL)"

	bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"

	depends on R8169 && EXPERIMENTAL

	help

	  NAPI is a new driver API designed to reduce CPU and interrupt load
@@ -2110,9 +2092,6 @@ config R8169_NAPI 
	  deployed on potentially unfriendly networks (e.g. in a firewall),

	  then say Y here.



	  See <file:Documentation/networking/NAPI_HOWTO.txt> for more

	  information.



	  If in doubt, say N.



config R8169_VLAN
@@ -2364,7 +2343,7 @@ config GIANFAR 
	  and MPC86xx family of chips, and the FEC on the 8540.



config GFAR_NAPI

	bool "NAPI Support"

	bool "Use Rx Polling (NAPI)"

	depends on GIANFAR



config UCC_GETH
@@ -2376,7 +2355,7 @@ config UCC_GETH 
	  which is available on some Freescale SOCs.



config UGETH_NAPI

	bool "NAPI Support"

	bool "Use Rx Polling (NAPI)"

	depends on UCC_GETH



config UGETH_MAGIC_PACKET
@@ -2494,7 +2473,7 @@ config CHELSIO_T3 


config EHEA

	tristate "eHEA Ethernet support"

	depends on IBMEBUS

	depends on IBMEBUS && INET

	select INET_LRO

	---help---

	  This driver supports the IBM pSeries eHEA ethernet adapter.
@@ -2559,9 +2538,6 @@ config IXGB_NAPI 
	  deployed on potentially unfriendly networks (e.g. in a firewall),

	  then say Y here.



	  See <file:Documentation/networking/NAPI_HOWTO.txt> for more

	  information.



	  If in doubt, say N.



config S2IO
@@ -2584,14 +2560,11 @@ config S2IO_NAPI 
	  deployed on potentially unfriendly networks (e.g. in a firewall),

	  then say Y here.



	  See <file:Documentation/networking/NAPI_HOWTO.txt> for more

	  information.



	  If in doubt, say N.



config MYRI10GE

	tristate "Myricom Myri-10G Ethernet support"

	depends on PCI

	depends on PCI && INET

	select FW_LOADER

	select CRC32

	select INET_LRO

drivers/net/dm9000.c

+3 −3
Original line number Diff line number Diff line
@@ -542,7 +542,8 @@ dm9000_probe(struct platform_device *pdev) 


	if (id_val != DM9000_ID) {

		printk("%s: wrong id: 0x%08x\n", CARDNAME, id_val);

		goto release;

		ret = -ENODEV;

		goto out;

	}



	/* from this point we assume that we have found a DM9000 */
@@ -602,7 +603,6 @@ dm9000_probe(struct platform_device *pdev) 
	}

	return 0;



 release:

out:

	printk("%s: not found (%d).\n", CARDNAME, ret);

drivers/net/phy/mdio-bitbang.c

+2 −0
Original line number Diff line number Diff line
@@ -185,3 +185,5 @@ void free_mdio_bitbang(struct mii_bus *bus) 
	module_put(ctrl->ops->owner);

	kfree(bus);

}



MODULE_LICENSE("GPL");

drivers/net/tsi108_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -1629,7 +1629,7 @@ tsi108_init_one(struct platform_device *pdev) 
		goto register_fail;

	}



	printk(KERN_INFO "%s: Tsi108 Gigabit Ethernet, MAC: %s\n"

	printk(KERN_INFO "%s: Tsi108 Gigabit Ethernet, MAC: %s\n",

	       dev->name, print_mac(mac, dev->dev_addr));

#ifdef DEBUG

	data->msg_enable = DEBUG;

drivers/net/tulip/Kconfig

+6 −8
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ config TULIP_MMIO 
	  If in doubt, say N.



config TULIP_NAPI

	bool "Use NAPI RX polling "

	bool "Use RX polling (NAPI)"

	depends on TULIP

	help

	  NAPI is a new driver API designed to reduce CPU and interrupt load
@@ -78,18 +78,16 @@ config TULIP_NAPI 
	  deployed on potentially unfriendly networks (e.g. in a firewall),

	  then say Y here.



	  See <file:Documentation/networking/NAPI_HOWTO.txt> for more

	  information.



	  If in doubt, say N.



config TULIP_NAPI_HW_MITIGATION

	bool "Use Interrupt Mitigation"

	depends on TULIP_NAPI

	---help---

	  Use HW to reduce RX interrupts. Not strict necessary since NAPI reduces

	  RX interrupts but itself. Although this reduces RX interrupts even at

	  low levels traffic at the cost of a small latency.

	  Use HW to reduce RX interrupts. Not strictly necessary since NAPI

	  reduces RX interrupts by itself. Interrupt mitigation reduces RX

	  interrupts even at low levels of traffic at the cost of a small

	  latency.



	  If in doubt, say Y.

CRA Git | Maintained and supported by SUSTech CRA and CCSE