Linus Torvalds 9457b24a09 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: (66 commits) can-bcm: fix minor heap overflow gianfar: Do not call device_set_wakeup_enable() under a spinlock ipv6: Warn users if maximum number of routes is reached. docs: Add neigh/gc_thresh3 and route/max_size documentation. axnet_cs: fix resume problem for some Ax88790 chip ipv6: addrconf: don't remove address state on ifdown if the address is being kept tcp: Don't change unlocked socket state in tcp_v4_err(). x25: Prevent crashing when parsing bad X.25 facilities cxgb4vf: add call to Firmware to reset VF State. cxgb4vf: Fail open if link_start() fails. cxgb4vf: flesh out PCI Device ID Table ... cxgb4vf: fix some errors in Gather List to skb conversion cxgb4vf: fix bug in Generic Receive Offload cxgb4vf: don't implement trivial (and incorrect) ndo_select_queue() ixgbe: Look inside vlan when determining offload protocol. bnx2x: Look inside vlan when determining checksum proto. vlan: Add function to retrieve EtherType from vlan packets. virtio-net: init link state correctly ucc_geth: Fix deadlock ucc_geth: Do not bring the whole IF down when TX failure. ...		2010-11-12 17:17:55 -08:00
..
appletalk	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
arcnet
arm
atl1c	atl1c: make functions static	2010-10-24 14:55:49 -07:00
atl1e	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
atlx	atl1 : fix panic on load	2010-11-03 18:50:05 -07:00
benet	be2net: Schedule/Destroy worker thread in probe()/remove() rather than open()/close()	2010-10-27 11:37:30 -07:00
bna	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
bnx2x	bnx2x: Look inside vlan when determining checksum proto.	2010-11-12 12:30:57 -08:00
bonding	bonding: Fix lockdep warning after bond_vlan_rx_register()	2010-10-27 14:24:07 -07:00
caif	caif: SPI-driver bugfix - incorrect padding.	2010-11-03 18:50:03 -07:00
can	netdev: can: Change mail address of Hans J. Koch	2010-10-30 16:49:38 -07:00
chelsio	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
cris
cxgb3	cxgb3: remove call to stop TX queues at load time.	2010-11-01 14:07:30 -07:00
cxgb4	cxgb4: remove call to stop TX queues at load time.	2010-11-01 14:07:31 -07:00
cxgb4vf	cxgb4vf: add call to Firmware to reset VF State.	2010-11-12 12:31:01 -08:00
e1000	e1000: make e1000_reinit_safe local	2010-10-24 15:07:14 -07:00
e1000e	e1000e: Add check for reset flags before displaying reset message	2010-10-28 10:18:59 -07:00
ehea	ehea: Fixing statistics	2010-10-27 14:24:13 -07:00
enic	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
fs_enet
hamradio	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
ibm_newemac	ibm_newemac: Remove netif_stop_queue() in emac_probe().	2010-11-01 08:49:51 -07:00
igb	igb: Fix unused variable warning.	2010-10-27 19:43:55 -07:00
igbvf	igbvf: fix panic on load	2010-10-28 10:19:01 -07:00
irda	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
ixgb	ixgb: call pci_disable_device in ixgb_remove	2010-10-28 10:19:00 -07:00
ixgbe	ixgbe: Look inside vlan when determining offload protocol.	2010-11-12 12:30:58 -08:00
ixgbevf	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
ixp2000
mlx4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-27 18:28:00 -07:00
myri10ge	myri10ge: DCA update (resubmit)	2010-09-29 19:45:37 -07:00
netxen	netxen: remove unused firmware exports	2010-11-03 18:50:05 -07:00
octeon
pch_gbe	pch_gbe: make local functions static	2010-10-21 03:09:44 -07:00
pcmcia	axnet_cs: fix resume problem for some Ax88790 chip	2010-11-12 14:00:04 -08:00
phy	phy/marvell: rename 88ec048 to 88e1318s and fix mscr1 addr	2010-10-29 13:50:25 -07:00
qlcnic	qlcnic: fix panic on load	2010-10-31 09:32:55 -07:00
qlge	qlge: bugfix: Restoring the vlan setting.	2010-10-27 11:37:30 -07:00
sfc	sfc: make functions static	2010-10-21 03:09:43 -07:00
skfp	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
stmmac	stmmac: enable/disable rx/tx in the core with a single write.	2010-10-28 11:47:54 -07:00
tokenring	tms380tr: Use mdelay() in tms380tr_wait().	2010-10-25 13:04:48 -07:00
tulip	de2104x: fix panic on load	2010-11-03 18:50:06 -07:00
usb	usbnet: fix usb_autopm_get_interface failure(v1)	2010-11-01 07:11:54 -07:00
vmxnet3	vmxnet: trivial annotation of protocol constant	2010-10-30 16:19:45 -07:00
vxge	vxge: make functions local and remove dead code	2010-10-24 15:07:12 -07:00
wan	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
wimax	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-11-12 17:17:55 -08:00
3c59x.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-04 11:56:38 -07:00
3c501.c
3c501.h
3c503.c
3c503.h
3c505.c
3c505.h
3c507.c
3c509.c
3c515.c
3c523.c	3c52x: remove IRQF_SAMPLE_RANDOM from legacy MCA drivers.	2010-10-19 02:32:09 -07:00
3c523.h
3c527.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
3c527.h
7990.c
7990.h
8139cp.c	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
8139too.c
8390.c
8390.h
8390p.c
82596.c
a2065.c
a2065.h
ac3200.c
acenic.c
acenic.h
amd8111e.c	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
amd8111e.h
apne.c
ariadne.c
ariadne.h
at1700.c
atarilance.c	net: atarilance - flags should be unsigned long	2010-10-28 11:47:53 -07:00
atp.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
atp.h
au1000_eth.c
au1000_eth.h
ax88796.c	drivers/net/ax88796.c: Return error code in failure	2010-10-21 04:25:50 -07:00
b44.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-21 08:43:05 -07:00
b44.h
bcm63xx_enet.c
bcm63xx_enet.h
bfin_mac.c	netdev: bfin_mac: push settings to platform resources	2010-10-25 04:54:25 -04:00
bfin_mac.h	netdev: bfin_mac: push settings to platform resources	2010-10-25 04:54:25 -04:00
bmac.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
bmac.h
bnx2_fw.h
bnx2.c	bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.	2010-10-21 19:59:32 -07:00
bnx2.h	bnx2: Increase max rx ring size from 1K to 2K	2010-10-21 03:09:47 -07:00
bsd_comp.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
cassini.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
cassini.h
cnic_defs.h	bnx2x, cnic, bnx2i: use new FW/HSI	2010-10-06 14:10:35 -07:00
cnic_if.h	cnic: Add support for 57712 device	2010-10-14 10:45:56 -07:00
cnic.c	cnic: Add support for 57712 device	2010-10-14 10:45:56 -07:00
cnic.h	cnic: Add support for 57712 device	2010-10-14 10:45:56 -07:00
cpmac.c
cs89x0.c
cs89x0.h
davinci_cpdma.c	net: davinci_emac: separate out cpdma code	2010-09-24 07:40:31 -07:00
davinci_cpdma.h	net: davinci_emac: separate out cpdma code	2010-09-24 07:40:31 -07:00
davinci_emac.c	net: davinci_emac: cleanup unused cpdma code	2010-09-24 07:40:31 -07:00
davinci_mdio.c	net: davinci_emac: separate out davinci mdio	2010-09-24 07:40:29 -07:00
de600.c
de600.h
de620.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
de620.h
declance.c
defxx.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
defxx.h
depca.c
depca.h
dl2k.c
dl2k.h
dm9000.c
dm9000.h
dnet.c	dnet: mark methods static and annotate for correct endianness	2010-10-16 11:13:20 -07:00
dnet.h
dummy.c	dummy: percpu stats and lockless xmit	2010-09-29 13:23:30 -07:00
e100.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
e2100.c
eepro.c
eexpress.c
eexpress.h
enc28j60_hw.h
enc28j60.c
epic100.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
eql.c
es3210.c
eth16i.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
ethoc.c
ewrk3.c
ewrk3.h
fealnx.c
fec_mpc52xx_phy.c
fec_mpc52xx.c
fec_mpc52xx.h
fec.c	net: allow FEC driver to use fixed PHY support	2010-10-13 09:56:31 -07:00
fec.h
forcedeth.c	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
fsl_pq_mdio.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
fsl_pq_mdio.h
gianfar_ethtool.c	gianfar: Do not call device_set_wakeup_enable() under a spinlock	2010-11-12 14:05:43 -08:00
gianfar_sysfs.c
gianfar.c	gianfar: Fix crashes on RX path (Was Re: [Bugme-new] [Bug 19692] New: linux-2.6.36-rc5 crash with gianfar ethernet at full line rate traffic)	2010-10-27 11:37:28 -07:00
gianfar.h
greth.c
greth.h
hamachi.c
hp100.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
hp100.h
hp-plus.c
hp.c
hplance.c
hplance.h
hydra.c
ibmlana.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
ibmlana.h
ibmveth.c	ibmveth: Free irq on error path	2010-10-21 01:26:46 -07:00
ibmveth.h
ifb.c
ioc3-eth.c
ipg.c
ipg.h
iseries_veth.c
jazzsonic.c
jme.c	jme: fix panic on load	2010-10-31 09:32:55 -07:00
jme.h	jme: Advance version number	2010-10-21 03:52:11 -07:00
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-29 14:17:12 -07:00
korina.c
ks8842.c
ks8851_mll.c
ks8851.c
ks8851.h
ksz884x.c
lance.c
lasi_82596.c
lib8390.c	8390: Don't oops on starting dev queue	2010-10-28 10:27:01 -07:00
lib82596.c
LICENSE.SRC
ll_temac_main.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-06 19:39:31 -07:00
ll_temac_mdio.c
ll_temac.h
lne390.c
loopback.c	net: add a core netdev->rx_dropped counter	2010-10-05 14:47:55 -07:00
lp486e.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
mac89x0.c
mac8390.c
macb.c	macb: Don't re-enable interrupts while in polling mode	2010-10-25 12:14:11 -07:00
macb.h
mace.c
mace.h
macmace.c
macsonic.c
macvlan.c
macvtap.c
Makefile	Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci	2010-10-25 10:59:31 -07:00
mdio.c
meth.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
meth.h
mii.c
mipsnet.c
mv643xx_eth.c	mv643xx_eth: Use netif_set_real_num_{rx, tx}_queues()	2010-09-27 22:09:55 -07:00
mvme147.c
myri_sbus.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
myri_sbus.h
natsemi.c
ne2.c
ne2k-pci.c
ne3210.c
ne-h8300.c
ne.c
netconsole.c	bonding: Fix netconsole to not deadlock on rmmod	2010-10-18 08:32:08 -07:00
netx-eth.c
ni52.c
ni52.h
ni65.c
ni65.h
ni5010.c
ni5010.h
niu.c	niu: introduce temp variables to avoid sparse warnings when swapping in-situ	2010-10-17 13:42:50 -07:00
niu.h
ns83820.c	ns83820: spin_lock_irq() => spin_lock()	2010-10-18 01:53:35 -07:00
pasemi_mac_ethtool.c
pasemi_mac.c
pasemi_mac.h
pci-skeleton.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
pcnet32.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
plip.c
ppp_async.c	net: Ppp_async: semaphore cleanup	2010-10-12 17:36:09 +02:00
ppp_deflate.c
ppp_generic.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
ppp_mppe.c
ppp_mppe.h
ppp_synctty.c
pppoe.c	net: constify some ppp/pptp structs	2010-09-21 18:04:47 -07:00
pppox.c	net: constify some ppp/pptp structs	2010-09-21 18:04:47 -07:00
pptp.c	net: constify some ppp/pptp structs	2010-09-21 18:04:47 -07:00
ps3_gelic_net.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
ps3_gelic_net.h
ps3_gelic_wireless.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
ps3_gelic_wireless.h
pxa168_eth.c	net: pxa168_etc.c recognize additional contributors	2010-09-30 17:31:16 -07:00
qla3xxx.c
qla3xxx.h
r6040.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-21 08:43:05 -07:00
r8169.c	r8169: fix sleeping while holding spinlock.	2010-11-09 08:26:43 -08:00
rionet.c	rionet: use free_netdev(netdev) instead of kfree()	2010-09-26 18:54:33 -07:00
rrunner.c
rrunner.h
s2io-regs.h
s2io.c	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
s2io.h
s6gmac.c
sb1000.c	drivers/net/sb1000.c: delete double assignment	2010-10-27 12:23:20 -07:00
sb1250-mac.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
sc92031.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
seeq8005.c
seeq8005.h
sgiseeq.c	drivers/net: sgiseeq: fix return on error	2010-10-26 10:02:13 -07:00
sgiseeq.h
sh_eth.c
sh_eth.h
sis190.c
sis900.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
sis900.h
skge.c	skge: Remove tx queue stopping in skge_devinit()	2010-11-08 12:17:06 -08:00
skge.h
sky2.c	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
sky2.h
slhc.c	slhc: Don't export symbols twice	2010-10-24 16:25:39 -07:00
slip.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
slip.h
smc91x.c	smc91x: Add missing #inclusion of <linux/irq.h>	2010-10-07 14:08:54 +01:00
smc91x.h
smc911x.c
smc911x.h
smc9194.c
smc9194.h
smc-mca.c
smc-ultra32.c
smc-ultra.c
smsc911x.c	MN10300: ASB2364: Add support for SMSC911X and SMC911X	2010-10-27 17:28:58 +01:00
smsc911x.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-11-05 15:25:48 -07:00
smsc9420.c
smsc9420.h
sni_82596.c
sonic.c
sonic.h
Space.c
spider_net_ethtool.c
spider_net.c
spider_net.h
starfire.c
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
sunbmac.c
sunbmac.h
sundance.c	sundance: Add initial ethtool stats support	2010-10-16 11:13:21 -07:00
sungem_phy.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
sungem_phy.h
sungem.c
sungem.h
sunhme.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
sunhme.h
sunlance.c
sunqe.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
sunqe.h
sunvnet.c
sunvnet.h
tc35815.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
tehuti.c
tehuti.h
tg3.c	tg3: Do not call device_set_wakeup_enable() under spin_lock_bh	2010-10-26 11:34:09 -07:00
tg3.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-21 08:43:05 -07:00
tlan.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
tlan.h	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
tsi108_eth.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
tsi108_eth.h
tun.c
typhoon.c	drivers/net/typhoon.c: delete double assignment	2010-10-27 12:23:20 -07:00
typhoon.h
ucc_geth_ethtool.c
ucc_geth.c	ucc_geth: Fix deadlock	2010-11-12 12:21:18 -08:00
ucc_geth.h
veth.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
via-rhine.c
via-velocity.c	vlan: Don't check for vlan group before vlan_tx_tag_present.	2010-10-21 01:26:52 -07:00
via-velocity.h	via-velocity: forced 1000 Mbps mode support.	2010-10-16 11:13:23 -07:00
virtio_net.c	virtio-net: init link state correctly	2010-11-12 12:21:18 -08:00
wd.c
xen-netfront.c	Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2010-10-28 17:11:17 -07:00
xilinx_emaclite.c	Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze	2010-10-25 16:53:11 -07:00
xtsonic.c
yellowfin.c
znet.c
zorro8390.c