Linus Torvalds 533bb8a4d7 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: (31 commits) [BRIDGE]: Fix crash in __ip_route_output_key with bridge netfilter [NETFILTER]: ipt_CLUSTERIP: fix race between clusterip_config_find_get and _entry_put [IPV6] ADDRCONF: Don't generate temporary address for ip6-ip6 interface. [IPV6] ADDRCONF: Ensure disabling multicast RS even if privacy extensions are disabled. [IPV6]: Use appropriate sock tclass setting for routing lookup. [IPV6]: IPv6 extension header structures need to be packed. [IPV6]: Fix ipv6 address fetching in raw6_icmp_error(). [NET]: Return more appropriate error from eth_validate_addr(). [ISDN]: Do not validate ISDN net device address prior to interface-up [NET]: Fix kernel-doc for skb_segment [SOCK] sk_stamp: should be initialized to ktime_set(-1L, 0) net: check for underlength tap writes net: make struct tun_struct private to tun.c [SCTP]: IPv4 vs IPv6 addresses mess in sctp_inet[6]addr_event. [SCTP]: Fix compiler warning about const qualifiers [SCTP]: Fix protocol violation when receiving an error lenght INIT-ACK [SCTP]: Add check for hmac_algo parameter in sctp_verify_param() [NET_SCHED] cls_u32: refcounting fix for u32_delete() [DCCP]: Fix skb->cb conflicts with IP [AX25]: Potential ax25_uid_assoc-s leaks on module unload. ...		2008-04-14 07:56:24 -07:00
..
appletalk	drivers/net/appletalk/ltpc.c: replace init_module&cleanup_module with module_init&module_exit	2008-03-05 18:49:21 -08:00
arcnet	drivers/net/arcnet/capmode.c: replace init_module&cleanup_module with module_init&module_exit	2008-03-05 18:49:51 -08:00
arm
atl1	drivers/net/atl1/atl1_main.c: remove unused variable	2008-03-17 07:56:57 -04:00
bonding	[BOND]: Fix warning in bond_sysfs.c	2008-03-28 16:15:38 -07:00
can
chelsio
cris
cxgb3	cxgb3: Fix lockdep problems with sge.reg_lock	2008-03-25 23:42:05 -04:00
e1000	e1000: warn if this driver is used for e1000e devices	2008-02-11 14:51:40 -05:00
e1000e	e1000e: remove unused read value in ASPM disable code.	2008-02-24 00:07:52 -05:00
ehea	ehea: Fix DLPAR memory add support	2008-04-12 04:47:50 -04:00
fec_8xx
fs_enet	fs_enet: Don't call NAPI functions when NAPI is not used.	2008-04-12 01:52:38 -04:00
hamradio	mkiss: ax_bump() locking fix	2008-02-15 10:51:51 -05:00
ibm_emac
ibm_newemac	ibm_newemac: emac_tx_csum typo fix	2008-03-28 21:52:39 -04:00
igb	igb trivial annotations	2008-03-25 23:16:03 -04:00
irda
ixgb	ixgb: remove unused variable	2008-03-25 23:16:09 -04:00
ixgbe	ixgbe: fix typo in speed mesage	2008-03-05 06:34:29 -05:00
ixp2000
mlx4	mlx4_core: Move table_find from fmr_alloc to fmr_enable	2008-02-14 10:43:48 -08:00
myri10ge
netxen	netxen, phy/marvell, skge: minor checkpatch fixes	2008-03-25 23:53:24 -04:00
pcmcia	axnet_cs: change debugging level for "Too much work at interrupt" message.	2008-03-05 06:28:49 -05:00
phy	net: marvell.c fix sparse shadowed variable warning	2008-04-04 17:26:15 -04:00
sk98lin
skfp
tokenring	[NET]: Undo code bloat in hot paths due to print_mac().	2008-04-08 16:50:44 -07:00
tulip	[netdrvr] tulip_read_eeprom fixes for BUG 4420	2008-03-28 21:52:14 -04:00
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-04-02 07:46:18 -07:00
wan	Mark generic HDLC + PPP as broken.	2008-04-12 04:48:56 -04:00
wireless	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2008-04-09 15:10:14 -07:00
3c59x.c
3c501.c	3c501: Further coding style fixes	2008-03-17 08:11:03 -04:00
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	8139too fix for Dreamcast	2008-02-11 10:29:33 -05:00
8390.c
8390.h
82596.c
a2065.c
a2065.h
ac3200.c	drivers/net/ac3200.c: replace init_module&cleanup_module with module_init&module_exit	2008-03-05 18:50:41 -08:00
acenic_firmware.h
acenic.c
acenic.h
amd8111e.c
amd8111e.h
apne.c	drivers/net/apne.c: replace init_module&cleanup_module with module_init&module_exit	2008-03-05 18:50:16 -08:00
ariadne.c
ariadne.h
at1700.c
atarilance.c	fix drivers/net/atarilance.c compilation	2008-03-05 06:34:32 -05:00
atp.c
atp.h
au1000_eth.c
au1000_eth.h
ax88796.c
b44.c	b44: Truncate PHY address	2008-03-25 23:42:07 -04:00
b44.h
bfin_mac.c	Blackfin EMAC Driver: delete unused variables to fixup gcc warnings	2008-03-28 21:52:56 -04:00
bfin_mac.h
bmac.c
bmac.h
bnx2_fw2.h
bnx2_fw.h
bnx2.c	[BNX2]: Update version to 1.7.4.	2008-02-23 19:49:48 -08:00
bnx2.h	[BNX2]: Disable parallel detect on an HP blade.	2008-02-23 19:48:57 -08:00
bnx2x_fw_defs.h	[BNX2X]: Correct Link management	2008-02-28 11:51:50 -08:00
bnx2x_hsi.h	[BNX2X]: Correct Link management	2008-02-28 11:51:50 -08:00
bnx2x_init_values.h
bnx2x_init.h	[BNX2X]: Prevent PCI queue overflow	2008-02-28 11:57:29 -08:00
bnx2x_reg.h	[BNX2X]: Correct Link management	2008-02-28 11:51:50 -08:00
bnx2x.c	BNX2X: Correct bringing chip out of reset	2008-04-09 15:25:46 -07:00
bnx2x.h	[BNX2X]: Fix Xmit bugs	2008-02-28 11:57:55 -08:00
bsd_comp.c
cassini.c
cassini.h
cpmac.c
cs89x0.c	drivers/net/cs89x0.c: compilation warning fix	2008-02-23 23:55:05 -05:00
cs89x0.h
de600.c
de600.h
de620.c
de620.h
declance.c
defxx.c
defxx.h
depca.c
depca.h
dl2k.c
dl2k.h
dm9000.c	dm9000 trivial annotation	2008-03-30 14:20:24 -07:00
dm9000.h
dummy.c
e100.c	e100: endianness annotations	2008-03-25 23:16:05 -04:00
e2100.c
eepro100.c
eepro.c
eexpress.c
eexpress.h
enc28j60_hw.h
enc28j60.c	net/enc28j60: oops fix	2008-03-05 18:51:19 -08:00
epic100.c	epic100 endianness annotations and fixes	2008-03-17 07:56:38 -04:00
eql.c
es3210.c
eth16i.c
ewrk3.c
ewrk3.h
fealnx.c
fec_mpc52xx_phy.c	[POWERPC] Fix MPC5200 (not B!) device tree so FEC ethernet works	2008-04-03 22:11:12 +11:00
fec_mpc52xx.c	[POWERPC] Fix MPC5200 (not B!) device tree so FEC ethernet works	2008-04-03 22:11:12 +11:00
fec_mpc52xx.h
fec.c	m68knommu: fix fec driver interrupt races	2008-03-04 08:04:11 -08:00
fec.h
forcedeth.c	forcedeth: mac address fix	2008-04-12 04:38:12 -04:00
gianfar_ethtool.c
gianfar_mii.c	gianfar iomem misannotations	2008-02-15 10:51:53 -05:00
gianfar_mii.h
gianfar_sysfs.c
gianfar.c	gianfar: don't pass NULL dev ptr to DMA ops	2008-02-23 23:57:48 -05:00
gianfar.h
hamachi.c
hp100.c
hp100.h
hp-plus.c
hp.c
hplance.c
hplance.h
hydra.c
ibmlana.c
ibmlana.h
ibmveth.c
ibmveth.h
ifb.c	[NET] ifb: set separate lockdep classes for queue locks	2008-03-20 17:05:13 -07:00
ioc3-eth.c	[IOC3] Fix section missmatch	2008-03-17 08:11:41 -04:00
ipg.c	drivers/net/ipg.c: remove unused variable	2008-03-17 07:56:42 -04:00
ipg.h
isa-skeleton.c
iseries_veth.c
jazzsonic.c
Kconfig	Make pasemi_mac.c depend on PPC_PASEMI to prevent link errors	2008-03-28 21:52:35 -04:00
lance.c
lasi_82596.c
lib8390.c
lib82596.c
LICENSE.SRC
lne390.c
loopback.c
lp486e.c
mac89x0.c
mac8390.c
macb.c	macb: Use semicolon instead of comma for statement	2008-04-12 03:01:44 -04:00
macb.h
mace.c
mace.h
macmace.c
macsonic.c
macvlan.c
Makefile	PS3: gelic: Add wireless support for PS3	2008-02-11 10:30:05 -05:00
meth.c
meth.h
mii.c
mipsnet.c
mv643xx_eth.c	mv643xx_eth: Define module alias for platform device	2008-03-05 06:28:31 -05:00
mvme147.c
myri_code.h
myri_sbus.c
myri_sbus.h
natsemi.c	natsemi: section fix	2008-02-09 23:41:08 -08:00
ne2.c
ne2k-pci.c	more misannotations: ne2k-pci	2008-03-17 07:56:33 -04:00
ne3210.c
ne-h8300.c
ne.c
netconsole.c	netconsole: avoid null pointer dereference at show_local_mac()	2008-02-15 02:01:58 -08:00
netx-eth.c
ni52.c	ni52: Remove 278 scripts/checkpatch errors	2008-02-11 10:28:33 -05:00
ni52.h	ni52: Remove 278 scripts/checkpatch errors	2008-02-11 10:28:33 -05:00
ni65.c
ni65.h
ni5010.c
ni5010.h
niu.c	[NIU]: More BMAC alt MAC address fixes.	2008-02-20 00:18:09 -08:00
niu.h	[NIU]: More BMAC alt MAC address fixes.	2008-02-20 00:18:09 -08:00
ns83820.c
pasemi_mac.c
pasemi_mac.h
pci-skeleton.c
pcnet32.c	pcnet32: Use print_mac	2008-02-11 10:28:31 -05:00
plip.c	plip: replace spin_lock_irq with spin_lock_irqsave in irq context	2008-04-01 11:16:04 -07:00
ppp_async.c
ppp_deflate.c
ppp_generic.c
ppp_mppe.c
ppp_mppe.h
ppp_synctty.c
pppoe.c
pppol2tp.c	[PPPOL2TP]: Fix SMP issues in skb reorder queue handling	2008-03-05 18:40:01 -08:00
pppox.c
ps3_gelic_net.c	PS3: gelic: Add wireless support for PS3	2008-02-11 10:30:05 -05:00
ps3_gelic_net.h	PS3: gelic: Add wireless support for PS3	2008-02-11 10:30:05 -05:00
ps3_gelic_wireless.c	PS3: gelic: change the prefix of the net interface for wireless	2008-03-13 15:57:25 -04:00
ps3_gelic_wireless.h	PS3: gelic: Add wireless support for PS3	2008-02-11 10:30:05 -05:00
qla3xxx.c
qla3xxx.h
r6040.c	r6040 endianness fixes	2008-03-17 07:56:27 -04:00
r8169.c
rionet.c
rrunner.c
rrunner.h
s2io-regs.h
s2io.c	S2io: Version update for Tx completion patch	2008-03-28 21:52:27 -04:00
s2io.h
saa9730.c
saa9730.h
sb1000.c
sb1250-mac.c
sc92031.c	sc92031: sysfs link missing	2008-04-12 04:39:20 -04:00
seeq8005.c
seeq8005.h
sgiseeq.c
sgiseeq.h
sis190.c	sis190: read the mac address from the eeprom first	2008-02-23 23:57:47 -05:00
sis900.c
sis900.h
skge.c	netxen, phy/marvell, skge: minor checkpatch fixes	2008-03-25 23:53:24 -04:00
skge.h
sky2.c	sky2: missing chip name for Yukon Supreme	2008-04-12 01:52:35 -04:00
sky2.h	sky2: fix LED management	2008-02-24 00:07:39 -05:00
slhc.c
slip.c
slip.h
smc91x.c	smc91x driver: fix bug: print warning only in interrupt mode	2008-04-12 04:39:10 -04:00
smc91x.h	Revert "smc91x: fix build breakage from the SMC_GET_MAC_ADDR API upgrade"	2008-04-07 13:20:08 -07:00
smc911x.c
smc911x.h
smc9194.c
smc9194.h
smc-mca.c
smc-ultra32.c
smc-ultra.c
sni_82596.c
sonic.c
sonic.h
Space.c
spider_net_ethtool.c
spider_net.c
spider_net.h
starfire_firmware.h
starfire_firmware.pl
starfire.c	[NET]: Undo code bloat in hot paths due to print_mac().	2008-04-08 16:50:44 -07:00
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c
sunbmac.c
sunbmac.h
sundance.c
sungem_phy.c
sungem_phy.h
sungem.c	[SUNGEM]: Fix NAPI assertion failure.	2008-03-23 03:35:12 -07:00
sungem.h
sunhme.c
sunhme.h
sunlance.c
sunqe.c
sunqe.h
sunvnet.c
sunvnet.h
tc35815.c
tehuti_fw.h
tehuti.c
tehuti.h
tg3.c	tg3: fix MMIO for PPC 44x platforms	2008-04-12 18:30:58 -07:00
tg3.h	[TG3]: Add PHY workaround for 5784	2008-04-03 21:44:44 -07:00
tlan.c	tlan: add static to function definitions	2008-02-23 23:57:46 -05:00
tlan.h
tsi108_eth.c	Tsi108_eth: Add ethtool support	2008-02-11 14:47:29 -05:00
tsi108_eth.h
tun.c	net: check for underlength tap writes	2008-04-12 18:49:30 -07:00
typhoon-firmware.h
typhoon.c	typhoon: section fix	2008-02-09 23:40:34 -08:00
typhoon.h
ucc_geth_ethtool.c
ucc_geth_mii.c
ucc_geth_mii.h
ucc_geth.c	ucc_geth: fix non-functional fixed phy support	2008-04-12 01:53:37 -04:00
ucc_geth.h
veth.c	veth: fix dev refcount race	2008-02-20 00:21:47 -08:00
via-rhine.c	[netdrvr] via-rhine: Use register offset definition for WOLcgClr	2008-02-24 00:07:37 -05:00
via-velocity.c	via-velocity: section fix	2008-02-09 23:41:40 -08:00
via-velocity.h
virtio_net.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-04-11 08:10:24 -07:00
wd.c
xen-netfront.c
yellowfin.c
znet.c
zorro8390.c