Linus Torvalds 152a6a9da1 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits) [IPV4] SNMP: Support OutMcastPkts and OutBcastPkts [IPV4] SNMP: Support InMcastPkts and InBcastPkts [IPV4] SNMP: Support InTruncatedPkts [IPV4] SNMP: Support InNoRoutes [SNMP]: Add definitions for {In,Out}BcastPkts [TCP] FRTO: RFC4138 allows Nagle override when new data must be sent [TCP] FRTO: Delay skb available check until it's mandatory [XFRM]: Restrict upper layer information by bundle. [TCP]: Catch skb with S+L bugs earlier [PATCH] INET : IPV4 UDP lookups converted to a 2 pass algo [L2TP]: Add the ability to autoload a pppox protocol module. [SKB]: Introduce skb_queue_walk_safe() [AF_IUCV/IUCV]: smp_call_function deadlock [IPV6]: Fix slab corruption running ip6sic [TCP]: Update references in two old comments [XFRM]: Export SPD info [IPV6]: Track device renames in snmp6. [SCTP]: Fix sctp_getsockopt_local_addrs_old() to use local storage. [NET]: Remove NETIF_F_INTERNAL_STATS, default to internal stats. [NETPOLL]: Remove CONFIG_NETPOLL_RX ...		2007-04-30 08:14:42 -07:00
..
appletalk	[SK_BUFF]: Introduce skb_copy_to_linear_data{_offset}	2007-04-25 22:28:29 -07:00
arcnet	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
arm	…
atl1	[NETDRV]: Perform missing csum_offset conversions	2007-04-25 22:28:41 -07:00
bonding	[NET]: Remove NETIF_F_INTERNAL_STATS, default to internal stats.	2007-04-28 21:04:03 -07:00
chelsio	chelsio: use const for virtual functions	2007-04-28 11:00:56 -04:00
cris	[SK_BUFF]: Convert skb->end to sk_buff_data_t	2007-04-25 22:26:29 -07:00
cxgb3	[SK_BUFF]: Introduce skb_copy_to_linear_data{_offset}	2007-04-25 22:28:29 -07:00
e1000	e1000: ROUND_UP macro cleanup in drivers/net/e1000	2007-04-28 11:01:07 -04:00
ehea	ehea: fix for dlpar support	2007-04-28 11:01:06 -04:00
fec_8xx	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
fs_enet	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
hamradio	baycom_ser_fdx: also allow i/o ports >= 0x1000 and enhanced failure logging	2007-04-28 11:01:02 -04:00
ibm_emac	[SK_BUFF]: Convert skb->tail to sk_buff_data_t	2007-04-25 22:26:28 -07:00
irda	[IrDA]: Adding carriage returns to mcs7780 debug statements	2007-04-25 22:29:31 -07:00
ixgb	ixgb: ROUND_UP macro cleanup in drivers/net/ixgb	2007-04-28 11:01:07 -04:00
ixp2000	…
myri10ge	[SK_BUFF]: Introduce skb_copy_to_linear_data{_offset}	2007-04-25 22:28:29 -07:00
netxen	NetXen: Fix for vmalloc issues	2007-04-28 11:01:06 -04:00
pcmcia	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
phy	network: add the missing phy_device speed information to phy_mii_ioctl	2007-04-28 11:00:57 -04:00
sk98lin	sk98lin: handle pci_enable_device() return value in skge_resume()	2007-04-28 11:00:57 -04:00
skfp	remove unused header file: drivers/net/skfp/h/lnkstat.h	2007-04-28 11:01:02 -04:00
tokenring	[SK_BUFF]: Introduce skb_copy_to_linear_data{_offset}	2007-04-25 22:28:29 -07:00
tulip	Rev tulip version	2007-04-28 11:00:59 -04:00
wan	Generic HDLC sparse annotations	2007-04-28 11:01:07 -04:00
wireless	[PATCH] zd1211rw: Add ID for ZyXEL AG-220	2007-04-28 11:01:04 -04:00
3c59x.c	…
3c501.c	…
3c501.h	…
3c503.c	…
3c503.h	…
3c505.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
3c505.h	…
3c507.c	…
3c509.c	3C509: Remove unnecessary include of <linux/pm_legacy.h>	2007-04-28 11:01:06 -04:00
3c515.c	…
3c523.c	[NET]: Fix warnings in 3c523.c and ni52.c	2007-04-25 22:28:27 -07:00
3c523.h	…
3c527.c	…
3c527.h	…
7990.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
7990.h	…
8139cp.c	…
8139too.c	[SK_BUFF]: Introduce skb_copy_to_linear_data{_offset}	2007-04-25 22:28:29 -07:00
8390.c	…
8390.h	…
82596.c	…
Kconfig	Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2007-04-30 08:14:42 -07:00
LICENSE.SRC	…
Makefile	ucc_geth: migrate ucc_geth to phylib	2007-04-28 11:01:04 -04:00
Space.c	…
a2065.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
a2065.h	…
ac3200.c	…
acenic.c	…
acenic.h	…
acenic_firmware.h	…
amd8111e.c	…
amd8111e.h	…
apne.c	…
ariadne.c	…
ariadne.h	…
at1700.c	…
atari_bionet.c	[SK_BUFF]: Introduce skb_copy_to_linear_data{_offset}	2007-04-25 22:28:29 -07:00
atari_pamsnet.c	[SK_BUFF]: Introduce skb_copy_to_linear_data{_offset}	2007-04-25 22:28:29 -07:00
atarilance.c	…
atp.c	…
atp.h	…
au1000_eth.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
au1000_eth.h	…
b44.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
b44.h	…
bmac.c	Revert "[POWERPC] Rename get_property to of_get_property: drivers"	2007-04-26 22:24:31 +10:00
bmac.h	…
bnx2.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
bnx2.h	…
bnx2_fw.h	…
bnx2_fw2.h	…
bsd_comp.c	…
cassini.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
cassini.h	…
cs89x0.c	…
cs89x0.h	…
de600.c	…
de600.h	…
de620.c	…
de620.h	…
declance.c	…
defxx.c	[SK_BUFF]: Introduce skb_copy_to_linear_data{_offset}	2007-04-25 22:28:29 -07:00
defxx.h	…
depca.c	…
depca.h	…
dgrs.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
dgrs.h	…
dgrs_asstruct.h	…
dgrs_bcomm.h	…
dgrs_es4h.h	…
dgrs_ether.h	…
dgrs_firmware.c	…
dgrs_i82596.h	…
dgrs_plx9060.h	…
dl2k.c	…
dl2k.h	…
dm9000.c	…
dm9000.h	…
dummy.c	…
e100.c	e100: Optionally use I/O mode only to access register space	2007-04-28 11:01:07 -04:00
e2100.c	…
eepro.c	…
eepro100.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
eexpress.c	[netdrvr] eexpress: minor corrections	2007-04-28 11:05:43 -04:00
eexpress.h	…
epic100.c	…
eql.c	…
es3210.c	…
eth16i.c	…
ewrk3.c	…
ewrk3.h	…
fealnx.c	…
fec.c	…
fec.h	…
forcedeth.c	[FORCEDETH]: Use skb_tailroom where appropriate	2007-04-25 22:26:41 -07:00
gianfar.c	…
gianfar.h	…
gianfar_ethtool.c	…
gianfar_mii.c	…
gianfar_mii.h	…
gianfar_sysfs.c	…
hamachi.c	…
hp-plus.c	…
hp.c	…
hp100.c	…
hp100.h	…
hplance.c	…
hplance.h	…
hydra.c	…
ibmlana.c	…
ibmlana.h	…
ibmveth.c	Fix sparse errors in drivers/net/ibmveth.c	2007-04-28 11:01:05 -04:00
ibmveth.h	…
ifb.c	…
ioc3-eth.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
isa-skeleton.c	…
iseries_veth.c	…
jazzsonic.c	…
lance.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
lasi_82596.c	…
lib8390.c	…
lne390.c	…
loopback.c	[NET]: loopback driver can use loopback_dev integrated net_device_stats	2007-04-25 22:28:52 -07:00
lp486e.c	…
mac89x0.c	…
mac8390.c	…
macb.c	[SK_BUFF]: Introduce skb_copy_to_linear_data{_offset}	2007-04-25 22:28:29 -07:00
macb.h	…
mace.c	Revert "[POWERPC] Rename get_property to of_get_property: drivers"	2007-04-26 22:24:31 +10:00
mace.h	…
macmace.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
macsonic.c	…
meth.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
meth.h	…
mii.c	mii: add kernel-doc notation	2007-04-28 11:01:05 -04:00
mipsnet.c	MIPSnet: Modernize use platform_device API.	2007-04-28 11:01:01 -04:00
mipsnet.h	…
mv643xx_eth.c	mv643xx_eth: make eth_port_uc_addr_{get,set}() calls symmetric	2007-04-28 11:01:02 -04:00
mv643xx_eth.h	mv643xx_eth: make eth_port_uc_addr_{get,set}() calls symmetric	2007-04-28 11:01:02 -04:00
mvme147.c	…
myri_code.h	…
myri_sbus.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
myri_sbus.h	…
natsemi.c	…
ne-h8300.c	…
ne.c	…
ne2.c	…
ne2k-pci.c	…
ne3210.c	…
netconsole.c	…
netx-eth.c	…
ni52.c	[NET]: Fix warnings in 3c523.c and ni52.c	2007-04-25 22:28:27 -07:00
ni52.h	…
ni65.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
ni65.h	…
ni5010.c	…
ni5010.h	…
ns83820.c	…
pasemi_mac.c	Revert "[POWERPC] Rename get_property to of_get_property: drivers"	2007-04-26 22:24:31 +10:00
pasemi_mac.h	…
pci-skeleton.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
pcnet32.c	pcnet32: change to use netdev_priv	2007-04-28 11:00:58 -04:00
plip.c	…
ppp_async.c	…
ppp_deflate.c	…
ppp_generic.c	[NET]: ROUND_UP macro cleanup in drivers/net/ppp_generic.c	2007-04-26 01:01:53 -07:00
ppp_mppe.c	…
ppp_mppe.h	…
ppp_synctty.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
pppoe.c	[PPPOE]: Fix device tear-down notification.	2007-04-25 22:29:21 -07:00
pppox.c	[L2TP]: Add the ability to autoload a pppox protocol module.	2007-04-30 00:21:02 -07:00
qla3xxx.c	make drivers/net/qla3xxx.c:PHY_DEVICES[] static	2007-04-28 11:01:03 -04:00
qla3xxx.h	qla3xxx: Adding support for the Agere PHY (ET1011C)	2007-04-28 11:01:02 -04:00
r8169.c	…
rionet.c	…
rrunner.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
rrunner.h	…
s2io-regs.h	S2io: Remove unused variables	2007-04-28 11:01:01 -04:00
s2io.c	S2io: Change of driver maintainers	2007-04-28 11:01:03 -04:00
s2io.h	S2io: Remove unused variables	2007-04-28 11:01:01 -04:00
saa9730.c	…
saa9730.h	…
sb1000.c	…
sb1250-mac.c	add NAPI support to sb1250-mac.c	2007-04-28 11:01:07 -04:00
sc92031.c	…
seeq8005.c	…
seeq8005.h	…
sgiseeq.c	Add support for Seeq 8003 on Challenge S Mezz board.	2007-04-28 11:00:56 -04:00
sgiseeq.h	…
shaper.c	…
sis190.c	…
sis900.c	sis900: Allocate rx replacement buffer before rx operation	2007-04-27 20:16:41 -04:00
sis900.h	…
skge.c	skge: version 1.11	2007-04-28 11:01:00 -04:00
skge.h	skge: rearrange fields	2007-04-28 11:01:00 -04:00
sky2.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
sky2.h	…
slhc.c	…
slip.c	…
slip.h	…
smc-mca.c	…
smc-ultra.c	…
smc-ultra32.c	…
smc91x.c	…
smc91x.h	…
smc911x.c	smc911x: fix compilation breakage wjen debug is on	2007-04-28 11:34:30 -04:00
smc911x.h	…
smc9194.c	…
smc9194.h	…
sonic.c	…
sonic.h	…
spider_net.c	Revert "[POWERPC] Rename get_property to of_get_property: drivers"	2007-04-26 22:24:31 +10:00
spider_net.h	…
spider_net_ethtool.c	…
starfire.c	…
starfire_firmware.h	…
starfire_firmware.pl	…
stnic.c	…
sun3_82586.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
sun3_82586.h	…
sun3lance.c	[SK_BUFF]: Introduce skb_copy_to_linear_data{_offset}	2007-04-25 22:28:29 -07:00
sunbmac.c	…
sunbmac.h	…
sundance.c	…
sungem.c	Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6	2007-04-27 09:29:04 -07:00
sungem.h	[SUNGEM]: Consolidate powerpc and sparc MAC probing code.	2007-04-26 01:54:48 -07:00
sungem_phy.c	Revert "[POWERPC] Rename get_property to of_get_property: drivers"	2007-04-26 22:24:31 +10:00
sungem_phy.h	…
sunhme.c	Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6	2007-04-27 09:29:04 -07:00
sunhme.h	…
sunlance.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
sunqe.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
sunqe.h	…
tc35815.c	tc35815: Zap changelog from source code	2007-04-28 11:00:58 -04:00
tg3.c	Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6	2007-04-27 09:29:04 -07:00
tg3.h	…
tlan.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
tlan.h	…
tsi108_eth.c	…
tsi108_eth.h	…
tun.c	[NET] tun/tap: fixed hw address handling	2007-04-26 01:00:55 -07:00
typhoon-firmware.h	…
typhoon.c	…
typhoon.h	…
ucc_geth.c	ucc_geth: version 1.1	2007-04-28 11:01:05 -04:00
ucc_geth.h	ucc_geth: Fix interrupt coalescing size and alignment	2007-04-28 11:01:04 -04:00
ucc_geth_mii.c	ucc_geth: migrate ucc_geth to phylib	2007-04-28 11:01:04 -04:00
ucc_geth_mii.h	ucc_geth: migrate ucc_geth to phylib	2007-04-28 11:01:04 -04:00
via-rhine.c	…
via-velocity.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
via-velocity.h	…
wd.c	…
yellowfin.c	…
znet.c	…
zorro8390.c	…