Linus Torvalds 0191b625ca Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits) net: Allow dependancies of FDDI & Tokenring to be modular. igb: Fix build warning when DCA is disabled. net: Fix warning fallout from recent NAPI interface changes. gro: Fix potential use after free sfc: If AN is enabled, always read speed/duplex from the AN advertising bits sfc: When disabling the NIC, close the device rather than unregistering it sfc: SFT9001: Add cable diagnostics sfc: Add support for multiple PHY self-tests sfc: Merge top-level functions for self-tests sfc: Clean up PHY mode management in loopback self-test sfc: Fix unreliable link detection in some loopback modes sfc: Generate unique names for per-NIC workqueues 802.3ad: use standard ethhdr instead of ad_header 802.3ad: generalize out mac address initializer 802.3ad: initialize ports LACPDU from const initializer 802.3ad: remove typedef around ad_system 802.3ad: turn ports is_individual into a bool 802.3ad: turn ports is_enabled into a bool 802.3ad: make ntt bool ixgbe: Fix set_ringparam in ixgbe to use the same memory pools. ... Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due to the conversion to %pI (in this networking merge) and the addition of doing IPv6 addresses (from the earlier merge of CIFS).		2008-12-28 12:49:40 -08:00
..
9p	9p: fix sparse warnings	2008-10-22 18:54:47 -05:00
bluetooth	Bluetooth: Enable per-module dynamic debug messages	2008-11-30 12:17:28 +01:00
irda	irda: Add irda_skb_cb qdisc related padding	2008-12-17 15:44:58 -08:00
iucv	[S390] iucv: Locking free version of iucv_message_(receive|send)	2008-12-25 13:39:04 +01:00
netfilter	netfilter: fix warning in net/netfilter/nf_conntrack_proto_tcp.c	2008-11-25 18:20:13 +01:00
netns	netns: ip6mr: declare reg_vif_num per-namespace	2008-12-10 16:29:24 -08:00
phonet	Phonet: use atomic for packet TX window	2008-12-17 15:48:31 -08:00
sctp	sctp: Implement socket option SCTP_GET_ASSOC_NUMBER	2008-12-25 16:57:24 -08:00
tc_act	pkt_action: add new action skbedit	2008-09-12 16:30:20 -07:00
tipc	tipc: Remove unneeded parameter to tipc_createport_raw()	2008-07-14 22:42:19 -07:00
act_api.h	[NET_SCHED]: act_api: use PTR_ERR in tcf_action_init/tcf_action_get	2008-01-28 15:11:17 -08:00
addrconf.h	netns: Add network namespace argument to rt6_fill_node() and ipv6_dev_get_saddr()	2008-08-14 15:33:21 -07:00
af_rxrpc.h
af_unix.h	net: Fix soft lockups/OOM issues w/ unix garbage collector	2008-11-26 15:32:27 -08:00
ah.h
arp.h	[NETFILTER]: ebtables: remove casts, use consts	2008-01-31 19:27:33 -08:00
atmclip.h
ax25.h	[AX25] ax25_ds_timer: use mod_timer instead of add_timer	2008-02-12 17:53:34 -08:00
ax88796.h
cfg80211.h	mac80211: Fix HT channel selection	2008-12-19 15:22:54 -05:00
checksum.h	include/net net/ - csum_partial - remove unnecessary casts	2008-11-19 15:44:53 -08:00
cipso_ipv4.h	cipso: Add support for native local labeling and fixup mapping names	2008-10-10 10:16:34 -04:00
compat.h	net: Use standard structures for generic socket address structures.	2008-07-19 22:35:47 -07:00
datalink.h
dcbnl.h	net: fix DCB setstate to return success/failure	2008-12-21 20:09:50 -08:00
dn.h	decnet: compile fix for removal of byteorder wrapper	2008-11-27 23:04:13 -08:00
dn_dev.h
dn_fib.h	decnet: remove private wrappers of endian helpers	2008-11-27 00:12:47 -08:00
dn_neigh.h
dn_nsp.h
dn_route.h
dsa.h	dsa: add support for Trailer tagging format	2008-10-08 17:24:16 -07:00
dsfield.h
dst.h	netns xfrm: lookup in netns	2008-11-25 17:35:18 -08:00
esp.h	[IPSEC]: Use crypto_aead and authenc in ESP	2008-01-31 19:27:02 -08:00
fib_rules.h	net: add fib_rules_ops to flush_cache method	2008-07-05 19:01:28 -07:00
flow.h	netns xfrm: lookup in netns	2008-11-25 17:35:18 -08:00
garp.h	vlan: Add GVRP support	2008-07-05 21:26:57 -07:00
gen_stats.h	pkt_sched: gen_estimator: Optimize gen_estimator_active()	2008-11-26 15:24:32 -08:00
genetlink.h	netlink: Improve returned error codes	2008-06-03 16:36:54 -07:00
icmp.h	mib: put icmpmsg statistics on struct net	2008-07-18 04:04:22 -07:00
ieee80211.h	ieee80211_security: correct warning about width of auth_mode	2008-12-12 13:48:30 -05:00
ieee80211_radiotap.h	wireless: clean up radiotap a bit	2008-12-05 09:32:59 -05:00
if_inet6.h	ipv6: make struct ipv6_devconf static	2008-07-22 14:21:58 -07:00
inet6_connection_sock.h
inet6_hashtables.h	inet: Don't lookup the socket if there's a socket attached to the skb	2008-10-07 12:41:01 -07:00
inet_common.h	[NETNS]: Inet control socket should not hold a namespace.	2008-04-03 14:28:30 -07:00
inet_connection_sock.h	net: more #ifdef CONFIG_COMPAT	2008-08-28 02:53:51 -07:00
inet_ecn.h	[IPV6]: Use appropriate sock tclass setting for routing lookup.	2008-04-13 23:40:51 -07:00
inet_frag.h	[NET]: Rename inet_frag.h identifiers COMPLETE, FIRST_IN, LAST_IN to INET_FRAG_*	2008-03-28 16:35:27 -07:00
inet_hashtables.h	net: Convert TCP/DCCP listening hash tables to use RCU	2008-11-23 17:22:55 -08:00
inet_sock.h	tcp: Port redirection support for TCP	2008-10-01 07:46:49 -07:00
inet_timewait_sock.h	net: Convert TCP & DCCP hash tables to use RCU / hlist_nulls	2008-11-16 19:40:17 -08:00
inetpeer.h	net: remove CVS keywords	2008-06-11 21:00:38 -07:00
ip.h	netns xfrm: per-netns sysctls	2008-11-25 18:00:48 -08:00
ip6_checksum.h
ip6_fib.h	[NETNS][IPV6] rt6_info - move rt6_info structure inside the namespace	2008-03-04 13:48:30 -08:00
ip6_route.h	netns: Add network namespace argument to rt6_fill_node() and ipv6_dev_get_saddr()	2008-08-14 15:33:21 -07:00
ip6_tunnel.h	net: remove CVS keywords	2008-06-11 21:00:38 -07:00
ip_fib.h	[IPV4]: Fix compile error building without CONFIG_FS_PROC	2008-02-05 02:54:16 -08:00
ip_vs.h	include/net net/ - csum_partial - remove unnecessary casts	2008-11-19 15:44:53 -08:00
ipcomp.h	ipsec: ipcomp - Merge IPComp implementations	2008-07-25 02:54:40 -07:00
ipconfig.h	net: remove CVS keywords	2008-06-11 21:00:38 -07:00
ipip.h	inet: Make tunnel RX/TX byte counters more consistent	2008-10-09 12:03:17 -07:00
ipv6.h	ipv6: making ip and icmp statistics per/namespace	2008-10-08 11:16:45 -07:00
ipx.h
iw_handler.h	wext: Emit event stream entries correctly when compat.	2008-06-16 18:50:49 -07:00
lapb.h
lib80211.h	wireless: missing include in lib80211.h	2008-11-21 11:42:55 -05:00
llc.h	[LLC]: station source mac address	2008-03-28 16:28:36 -07:00
llc_c_ac.h
llc_c_ev.h
llc_c_st.h
llc_conn.h
llc_if.h	[LLC]: Kill static inline llc_addrany	2008-02-29 11:46:17 -08:00
llc_pdu.h	[LLC]: skb allocation size for responses	2008-03-31 21:02:47 -07:00
llc_s_ac.h
llc_s_ev.h
llc_s_st.h
llc_sap.h	[LLC]: skb allocation size for responses	2008-03-31 21:02:47 -07:00
mac80211.h	mac80211: implement dynamic power save	2008-12-19 15:24:00 -05:00
mip6.h	[IPV6] MIP6: Use our standard definitions for paddings.	2008-04-12 13:43:22 +09:00
ndisc.h	bonding: send IPv6 neighbor advertisement on failover	2008-11-06 00:49:37 -05:00
neighbour.h	net: Cleanup of neighbour code	2008-11-12 00:54:54 -08:00
net_namespace.h	netns xfrm: add netns boilerplate	2008-11-25 17:14:31 -08:00
netdma.h
netevent.h
netlabel.h	netlabel: Add configuration support for local labeling	2008-10-10 10:16:34 -04:00
netlink.h	netlink: fix (theoretical) overrun in message iteration	2008-12-25 17:21:17 -08:00
netrom.h
nexthop.h
p8022.h
pkt_cls.h	ematch: simpler tcf_em_unregister()	2008-11-16 23:01:49 -08:00
pkt_sched.h	pkt_sched: Remove the tx queue state check in qdisc_run()	2008-09-23 01:05:56 -07:00
protocol.h	ipv4: Add GRO infrastructure	2008-12-15 23:41:09 -08:00
psnap.h
raw.h	[RAW]: Add raw_hashinfo member on struct proto.	2008-03-22 16:56:51 -07:00
rawv6.h
red.h
request_sock.h	net: Fix memory leak in the proto_register function	2008-11-21 16:45:22 -08:00
rose.h	rose: improving AX25 routing frames via ROSE network	2008-06-17 17:08:32 -07:00
route.h	ipv4: Conditionally enable transparent flow flag when connecting	2008-10-01 07:35:39 -07:00
rtnetlink.h	[RTNL]: Introduce the rtnl_kill_links helper.	2008-04-16 00:46:52 -07:00
sch_generic.h	pkt_sched: Remove qdisc->ops->requeue() etc.	2008-11-13 22:56:30 -08:00
scm.h	Merge branch 'master' into next	2008-11-14 11:29:12 +11:00
slhc_vj.h
snmp.h	net: remove CVS keywords	2008-06-11 21:00:38 -07:00
sock.h	net: Use a percpu_counter for orphan_count	2008-11-25 21:17:14 -08:00
stp.h	net: Add STP demux layer	2008-07-05 21:25:39 -07:00
tcp.h	tcp: Add GRO support	2008-12-15 23:43:36 -08:00
tcp_states.h
timewait_sock.h	net: Fix memory leak in the proto_register function	2008-11-21 16:45:22 -08:00
transp_v6.h	net: change proto destroy method to return void	2008-06-14 17:04:49 -07:00
udp.h	udp: Use hlist_nulls in UDP RCU code	2008-11-16 19:39:21 -08:00
udplite.h	udp: introduce struct udp_table and multiple spinlocks	2008-10-29 01:41:45 -07:00
wext.h	wext: Dispatch and handle compat ioctls entirely in net/wireless/wext.c	2008-06-16 18:32:46 -07:00
wireless.h	cfg80211: add support for custom firmware regulatory solutions	2008-11-25 16:41:27 -05:00
x25.h
x25device.h
xfrm.h	netns xfrm: per-netns sysctls	2008-11-25 18:00:48 -08:00