Linus Torvalds 402168cee1 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: (37 commits) sky2: Avoid races in sky2_down drivers/net/mlx4: Adjust constant drivers/net: Move a dereference below a NULL test drivers/net: Move a dereference below a NULL test connector: maintainer/mail update. USB host CDC Phonet network interface driver macsonic, jazzsonic: fix oops on module unload macsonic: move probe function to .devinit.text can: switch carrier on if device was stopped while in bus-off state can: restart device even if dev_alloc_skb() fails can: sja1000: remove duplicated includes New device ID for sc92031 [1088:2031] 3c589_cs: re-initialize the multicast in the tc589_reset Fix error return for setsockopt(SO_TIMESTAMPING) netxen: fix thermal check and shutdown netxen: fix deadlock on dev close netxen: fix context deletion sequence net: Micrel KS8851 SPI network driver tcp: Use correct peer adr when copying MD5 keys tcp: Fix MD5 signature checking on IPv4 mapped sockets ...		2009-07-22 09:49:58 -07:00
..
appletalk
arcnet	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
arm	Add mac driver for w90p910	2009-07-20 07:45:05 -07:00
atl1c	atl1c: misplaced parenthesis	2009-07-16 18:05:20 -07:00
atl1e	atl1*: add device_set_wakeup_enable to atl1*_set_wol	2009-06-25 02:58:17 -07:00
atlx	atlx: duplicate testing of MCAST flag	2009-07-13 11:02:55 -07:00
benet	be2net: fix spurious interrupt handling in intx mode	2009-07-03 20:09:45 -07:00
bonding	bonding: clean muticast addresses when device changes type	2009-07-16 18:05:23 -07:00
can	can: switch carrier on if device was stopped while in bus-off state	2009-07-20 12:28:30 -07:00
chelsio
cris
cxgb3	cxgb3: Fix crash caused by stashing wrong netdev_queue	2009-07-09 17:16:06 -07:00
e1000	e1000: return PCI_ERS_RESULT_DISCONNECT on permanent error	2009-06-30 19:47:00 -07:00
e1000e	e1000e: disable K1 at 1000Mbps for 82577/82578	2009-07-03 20:09:42 -07:00
ehea	netdev: restore MTU change operation	2009-07-12 14:20:04 -07:00
enic
fs_enet
hamradio	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-07-22 09:49:58 -07:00
ibm_newemac	drivers/net: Move a dereference below a NULL test	2009-07-21 13:00:43 -07:00
igb	igb: gcc-3.4.6 fix	2009-07-13 11:11:41 -07:00
igbvf	convert some DMA_nnBIT_MASK() callers	2009-06-19 16:46:06 -07:00
irda	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
ixgb
ixgbe	ixgbe: Remove DPRINTK messages in DCB mode	2009-07-16 18:05:41 -07:00
ixp2000
mlx4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-07-22 09:49:58 -07:00
myri10ge
netxen	netxen: fix thermal check and shutdown	2009-07-20 08:23:33 -07:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-07-22 09:49:58 -07:00
phy	NET: phy_device, fix lock imbalance	2009-07-14 12:03:39 -07:00
qlge	qlge: Fix sizeof usage.	2009-07-03 19:10:51 -07:00
sfc
skfp
tokenring
tulip	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
usb	USB host CDC Phonet network interface driver	2009-07-21 12:40:39 -07:00
vxge	vxge: Enable SRIOV support in the driver.	2009-06-17 04:31:14 -07:00
wan	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
wimax	debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.	2009-06-15 21:30:28 -07:00
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-07-14 18:33:54 -07:00
3c59x.c
3c501.c
3c501.h
3c503.c
3c503.h
3c505.c
3c505.h
3c507.c
3c509.c
3c515.c
3c523.c
3c523.h
3c527.c
3c527.h
7990.c
7990.h
8139cp.c
8139too.c	netdev: restore MTU change operation	2009-07-12 14:20:04 -07:00
8390.c
8390.h
8390p.c
82596.c
a2065.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
a2065.h
ac3200.c
acenic.c
acenic.h
amd8111e.c
amd8111e.h
apne.c
ariadne.c
ariadne.h
at1700.c
atarilance.c
atp.c
atp.h
au1000_eth.c
au1000_eth.h
ax88796.c
b44.c
b44.h
bfin_mac.c
bfin_mac.h
bmac.c	Fix compile error in bmac.c	2009-07-09 20:32:31 -07:00
bmac.h
bnx2.c	bnx2: Fix the behavior of ethtool when ONBOOT=no	2009-06-24 00:19:06 -07:00
bnx2.h
bnx2_fw.h
bnx2x.h	bnx2x: Fix the maximal values of coalescing timeouts.	2009-07-05 18:03:23 -07:00
bnx2x_dump.h
bnx2x_fw_defs.h
bnx2x_fw_file_hdr.h
bnx2x_hsi.h
bnx2x_init.h
bnx2x_init_ops.h
bnx2x_link.c	drivers/net: Move a dereference below a NULL test	2009-07-21 13:00:44 -07:00
bnx2x_link.h
bnx2x_main.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
bnx2x_reg.h
bsd_comp.c
cassini.c
cassini.h
cnic.c	cnic: Fix __symbol_get() build error.	2009-06-21 11:00:33 -05:00
cnic.h
cnic_defs.h
cnic_if.h	cnic: Fix __symbol_get() build error.	2009-06-21 11:00:33 -05:00
cpmac.c	cpmac: fix compilation failure introduced with netdev_ops conversion	2009-06-24 18:03:11 -07:00
cs89x0.c	drivers/net: using spin_lock_irqsave() in net_send_packet()	2009-07-14 12:03:41 -07:00
cs89x0.h
davinci_emac.c	davinci_emac: fix kernel oops when changing MAC address while interface is down	2009-07-08 10:46:44 -07:00
de600.c
de600.h
de620.c
de620.h
declance.c
defxx.c
defxx.h
depca.c
depca.h
dl2k.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
dl2k.h
dm9000.c
dm9000.h
dnet.c
dnet.h
dummy.c
e100.c	E100: work around the driver using streaming DMA mapping for RX descriptors.	2009-07-16 18:05:25 -07:00
e2100.c
eepro.c
eexpress.c
eexpress.h
enc28j60.c
enc28j60_hw.h
epic100.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
eql.c
es3210.c
eth16i.c
ethoc.c
ewrk3.c
ewrk3.h
fealnx.c	fealnx: Fix build breakage -- PR_CONT should be KERN_CONT	2009-07-08 17:35:02 -07:00
fec.c	netdev: restore MTU change operation	2009-07-12 14:20:04 -07:00
fec.h	fec: fix definition of 5272 version of FEC_X_DES_ACTIVE register	2009-07-06 18:56:11 -07:00
fec_mpc52xx.c	Merge commit 'gcl/merge' into next	2009-06-18 11:22:08 +10:00
fec_mpc52xx.h
fec_mpc52xx_phy.c	Merge commit 'gcl/merge' into next	2009-06-18 11:22:08 +10:00
forcedeth.c	forcedeth: Fix NAPI race.	2009-07-05 18:03:33 -07:00
fsl_pq_mdio.c	fsl_pq_mdio: Fix fsl_pq_mdio to work with modules	2009-06-25 20:03:53 -07:00
fsl_pq_mdio.h
gianfar.c	netdev: restore MAC address set and validate operations	2009-07-12 14:20:02 -07:00
gianfar.h
gianfar_ethtool.c
gianfar_sysfs.c
hamachi.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
hp-plus.c
hp.c
hp100.c	net: fix network drivers ndo_start_xmit() return values	2009-06-17 04:31:16 -07:00
hp100.h
hplance.c
hplance.h
hydra.c
ibmlana.c
ibmlana.h
ibmveth.c
ibmveth.h
ifb.c
ioc3-eth.c
ipg.c
ipg.h
isa-skeleton.c	drivers/net: using spin_lock_irqsave() in net_send_packet()	2009-07-14 12:03:41 -07:00
iseries_veth.c
jazzsonic.c	macsonic, jazzsonic: fix oops on module unload	2009-07-21 12:21:49 -07:00
jme.c
jme.h
Kconfig	net: Micrel KS8851 SPI network driver	2009-07-20 08:23:26 -07:00
korina.c
ks8842.c
ks8851.c	net: Micrel KS8851 SPI network driver	2009-07-20 08:23:26 -07:00
ks8851.h	net: Micrel KS8851 SPI network driver	2009-07-20 08:23:26 -07:00
lance.c
lasi_82596.c
lib8390.c
lib82596.c
LICENSE.SRC
ll_temac.h
ll_temac_main.c
ll_temac_mdio.c
lne390.c
loopback.c
lp486e.c
mac89x0.c
mac8390.c
macb.c
macb.h
mace.c
mace.h
macmace.c
macsonic.c	macsonic, jazzsonic: fix oops on module unload	2009-07-21 12:21:49 -07:00
macvlan.c
Makefile	net: Micrel KS8851 SPI network driver	2009-07-20 08:23:26 -07:00
mdio.c	mdio add missing GPL flag	2009-06-25 20:06:34 -07:00
meth.c
meth.h
mii.c
mipsnet.c
mv643xx_eth.c	mv643xx_eth: fix unicast filter programming in promiscuous mode	2009-06-19 01:12:52 -07:00
mvme147.c
myri_sbus.c
myri_sbus.h
natsemi.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
ne-h8300.c
ne.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
ne2.c
ne2k-pci.c
ne3210.c
netconsole.c
netx-eth.c
ni52.c
ni52.h
ni65.c
ni65.h
ni5010.c
ni5010.h
niu.c	net: group address list and its count	2009-06-18 00:29:08 -07:00
niu.h
ns83820.c
pasemi_mac.c
pasemi_mac.h
pasemi_mac_ethtool.c
pci-skeleton.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
pcnet32.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
plip.c	netdev: restore MTU change operation	2009-07-12 14:20:04 -07:00
ppp_async.c	Revert "ppp: Fix throttling bugs"	2009-07-16 09:14:23 -07:00
ppp_deflate.c
ppp_generic.c
ppp_mppe.c
ppp_mppe.h
ppp_synctty.c	Revert "ppp: Fix throttling bugs"	2009-07-16 09:14:23 -07:00
pppoe.c
pppol2tp.c
pppox.c
ps3_gelic_net.c	netdev: restore MAC address set and validate operations	2009-07-12 14:20:02 -07:00
ps3_gelic_net.h
ps3_gelic_wireless.c	netdev: restore MAC address set and validate operations	2009-07-12 14:20:02 -07:00
ps3_gelic_wireless.h
qla3xxx.c	qla3xxx: Don't sleep while holding lock.	2009-06-23 16:36:27 -07:00
qla3xxx.h
r6040.c	r6040: bump driver version to 0.24 and date to 08 July 2009	2009-07-08 10:49:28 -07:00
r8169.c	r8169: remove unused variable	2009-06-19 01:12:52 -07:00
rionet.c
rrunner.c
rrunner.h
s2io-regs.h
s2io.c
s2io.h
s6gmac.c	s6gmac: xtensa s6000 on-chip ethernet driver	2009-06-22 02:37:34 -07:00
sb1000.c
sb1250-mac.c
sc92031.c	New device ID for sc92031 [1088:2031]	2009-07-20 08:27:02 -07:00
seeq8005.c
seeq8005.h
sgiseeq.c
sgiseeq.h
sh_eth.c	sh_eth: remove redundant test on unsigned	2009-06-25 20:03:56 -07:00
sh_eth.h
sis190.c	sis190: use an adequate phy list entry as a fallback	2009-06-17 18:46:46 -07:00
sis900.c
sis900.h
skge.c
skge.h
sky2.c	sky2: Avoid races in sky2_down	2009-07-21 20:57:56 -07:00
sky2.h	sky2: skb recycling	2009-06-17 18:46:54 -07:00
slhc.c
slip.c
slip.h
smc-mca.c
smc-ultra.c
smc-ultra32.c
smc91x.c	netdev: restore MTU change operation	2009-07-12 14:20:04 -07:00
smc91x.h
smc911x.c
smc911x.h
smc9194.c
smc9194.h
smsc911x.c	netdev: restore MTU change operation	2009-07-12 14:20:04 -07:00
smsc911x.h
smsc9420.c
smsc9420.h
sni_82596.c
sonic.c	sonic: Fix build after ndo_start_xmit() changes.	2009-06-17 01:36:23 -07:00
sonic.h
Space.c
spider_net.c
spider_net.h
spider_net_ethtool.c
starfire.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c
sunbmac.c
sunbmac.h
sundance.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
sungem.c
sungem.h
sungem_phy.c
sungem_phy.h
sunhme.c
sunhme.h
sunlance.c
sunqe.c
sunqe.h
sunvnet.c	netdev: restore MTU change operation	2009-07-12 14:20:04 -07:00
sunvnet.h
tc35815.c
tehuti.c
tehuti.h
tg3.c
tg3.h
tlan.c
tlan.h
tsi108_eth.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
tsi108_eth.h
tun.c	tun/tap: Fix crashes if open() /dev/net/tun and then poll() it.	2009-07-06 12:47:07 -07:00
typhoon.c
typhoon.h
ucc_geth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-18 14:07:15 -07:00
ucc_geth.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-18 14:07:15 -07:00
ucc_geth_ethtool.c
veth.c	Revert "veth: prevent oops caused by netdev destructor"	2009-06-25 02:45:42 -07:00
via-rhine.c	netdev: restore MTU change operation	2009-07-12 14:20:04 -07:00
via-velocity.c	via-velocity: Fix velocity driver unmapping incorrect size.	2009-06-21 22:42:30 -07:00
via-velocity.h
virtio_net.c	net: group address list and its count	2009-06-18 00:29:08 -07:00
wd.c
xen-netfront.c
xtsonic.c
yellowfin.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
znet.c
zorro8390.c