David S. Miller df39e8ba56 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	drivers/net/ehea/ehea_main.c
	drivers/net/wireless/iwlwifi/Kconfig
	drivers/net/wireless/rt2x00/rt61pci.c
	net/ipv4/inet_timewait_sock.c
	net/ipv6/raw.c
	net/mac80211/ieee80211_sta.c

2008-04-14 02:30:23 -07:00

..

ipvs

net: replace remaining __FUNCTION__ occurrences

2008-03-05 20:47:47 -08:00

netfilter

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2008-04-14 02:30:23 -07:00

af_inet.c

[INET]: uc_ttl assignment in inet_ctl_sock_create is redundant.

2008-04-03 14:30:12 -07:00

ah4.c

[IPSEC]: Fix bogus usage of u64 on input sequence number

2008-02-12 22:50:35 -08:00

arp.c

[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.

2008-03-26 04:39:53 +09:00

cipso_ipv4.c

[IPV4]: Remove unused ip_options->is_data.

2008-03-22 16:35:29 -07:00

datagram.c

[IPV4] net/ipv4: Use ipv4_is_<type>

2008-01-28 14:58:15 -08:00

devinet.c

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

2008-03-26 04:39:55 +09:00

esp4.c

[ESP]: Ensure IV is in linear part of the skb to avoid BUG() due to OOB access

2008-03-27 16:08:03 -07:00

fib_frontend.c

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

2008-03-26 04:39:55 +09:00

fib_hash.c

[NET] NETNS: Omit seq_net_private->net without CONFIG_NET_NS.

2008-03-26 04:39:56 +09:00

fib_lookup.h

[IPV4] FIB_HASH: Reduce memory needs and speedup lookups

2008-01-28 15:02:46 -08:00

fib_rules.c

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

2008-03-26 04:39:55 +09:00

fib_semantics.c

[NETNS]: Lookup in FIB semantic hashes taking into account the namespace.

2008-01-31 19:28:41 -08:00

fib_trie.c

ipv4: fib_trie leaf free optimization

2008-04-10 03:47:34 -07:00

icmp.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2008-04-14 02:30:23 -07:00

igmp.c

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

2008-03-26 04:39:55 +09:00

inet_connection_sock.c

[INET]: sk_reuse is valbool

2008-04-13 21:50:08 -07:00

inet_diag.c

[NETNS]: Tcp-v6 sockets per-net lookup.

2008-01-31 19:28:20 -08:00

inet_fragment.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2008-04-02 22:35:23 -07:00

inet_hashtables.c

[SOCK][NETNS]: Add a struct net argument to sock_prot_inuse_add and _get.

2008-03-31 19:41:46 -07:00

inet_lro.c

[LRO] Fix lro_mgr->features checks

2008-01-08 23:30:18 -08:00

inet_timewait_sock.c

[NETNS][IPV6] tcp - assign the netns for timewait sockets

2008-04-10 20:53:10 -07:00

inetpeer.c

[INET]: Use list_head-s in inetpeer.c

2007-11-12 21:27:28 -08:00

ip_forward.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2008-04-02 22:35:23 -07:00

ip_fragment.c

[NET]: Rename inet_frag.h identifiers COMPLETE, FIRST_IN, LAST_IN to INET_FRAG_*

2008-03-28 16:35:27 -07:00

ip_gre.c

[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.

2008-03-26 04:39:53 +09:00

ip_input.c

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

2008-03-26 04:39:55 +09:00

ip_options.c

[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.

2008-03-26 04:39:53 +09:00

ip_output.c

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

2008-03-26 04:39:55 +09:00

ip_sockglue.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2008-04-14 02:30:23 -07:00

ipcomp.c

[IPCOMP]: Disable BH on output when using shared tfm

2008-02-28 11:23:17 -08:00

ipconfig.c

[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.

2008-03-26 04:39:53 +09:00

ipip.c

[IPV4]: Add 'rtable' field in struct sk_buff to alias 'dst' and avoid casts

2008-03-05 18:30:47 -08:00

ipmr.c

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

2008-03-26 04:39:55 +09:00

Kconfig

[UDP]: Revert udplite and code split.

2008-03-06 16:22:02 -08:00

Makefile

[UDP]: Revert udplite and code split.

2008-03-06 16:22:02 -08:00

netfilter.c

[NETNS]: Add namespace parameter to ip_route_output_key.

2008-01-28 15:11:07 -08:00

proc.c

[IPV4][NETNS]: Display per-net info in sockstat file.

2008-03-31 19:43:18 -07:00

protocol.c

[IPV4]: align inet_protos[] on SMP

2007-04-25 22:28:20 -07:00

raw.c

[SOCK][NETNS]: Add a struct net argument to sock_prot_inuse_add and _get.

2008-03-31 19:41:46 -07:00

route.c

IPV4: use xor rather than multiple ands for route compare

2008-04-10 04:00:28 -07:00

syncookies.c

[Syncookies]: Add support for TCP options via timestamps.

2008-04-10 03:12:40 -07:00

sysctl_net_ipv4.c

[NETNS][ICMP]: Make ctl tables for ICMP sysctls per-net.

2008-03-26 01:56:24 -07:00

tcp_bic.c

[TCP]: BIC web page link is corrected.

2008-02-28 22:14:32 -08:00

tcp_cong.c

[TCP]: Uninline tcp_is_cwnd_limited

2008-01-28 15:01:48 -08:00

tcp_cubic.c

[TCP]: TCP cubic v2.2

2008-03-04 14:17:41 -08:00

tcp_diag.c

[INET]: Let inet_diag and friends autoload

2007-10-22 02:59:54 -07:00

tcp_highspeed.c

[TCP]: Cong.ctrl modules: remove unused good_ack from cong_avoid

2008-01-28 14:55:41 -08:00

tcp_htcp.c

[TCP]: Cong.ctrl modules: remove unused good_ack from cong_avoid

2008-01-28 14:55:41 -08:00

tcp_hybla.c

[TCP]: Cong.ctrl modules: remove unused good_ack from cong_avoid

2008-01-28 14:55:41 -08:00

tcp_illinois.c

[TCP]: Cong.ctrl modules: remove unused good_ack from cong_avoid

2008-01-28 14:55:41 -08:00

tcp_input.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2008-04-14 02:30:23 -07:00

tcp_ipv4.c

[TCP]: Remove owner from tcp_seq_afinfo.

2008-04-13 22:13:53 -07:00

tcp_lp.c

[TCP]: Cong.ctrl modules: remove unused good_ack from cong_avoid

2008-01-28 14:55:41 -08:00

tcp_minisocks.c

[TCP]: TCP_DEFER_ACCEPT updates - process as established

2008-03-21 16:33:01 -07:00

tcp_output.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2008-04-14 02:30:23 -07:00

tcp_probe.c

[NET]: Make /proc/net per network namespace

2007-10-10 16:49:06 -07:00

tcp_scalable.c

[TCP]: Cong.ctrl modules: remove unused good_ack from cong_avoid

2008-01-28 14:55:41 -08:00

tcp_timer.c

[TCP]: TCP_DEFER_ACCEPT updates - process as established

2008-03-21 16:33:01 -07:00

tcp_vegas.c

[TCP]: Cong.ctrl modules: remove unused good_ack from cong_avoid

2008-01-28 14:55:41 -08:00

tcp_vegas.h

[TCP]: congestion control API pass RTT in microseconds

2007-07-31 02:27:57 -07:00

tcp_veno.c

[TCP]: Cong.ctrl modules: remove unused good_ack from cong_avoid

2008-01-28 14:55:41 -08:00

tcp_westwood.c

[TCP]: congestion control API pass RTT in microseconds

2007-07-31 02:27:57 -07:00

tcp_yeah.c

[TCP]: Cong.ctrl modules: remove unused good_ack from cong_avoid

2008-01-28 14:55:41 -08:00

tcp.c

Merge branch 'master' of ../net-2.6/

2008-03-23 22:54:03 -07:00

tunnel4.c

[INET]: Cleanup the xfrm4_tunnel_(un)register

2007-11-10 21:48:54 -08:00

udp_impl.h

[UDP]: Make full use of proto.h.udp_hash innovation.

2008-03-22 16:51:21 -07:00

udp.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2008-04-02 22:35:23 -07:00

udplite.c

[UDP]: Remove owner from udp_seq_afinfo.

2008-03-28 18:25:53 -07:00

xfrm4_input.c

[IPSEC]: Fix transport-mode async resume on intput without netfilter

2008-01-28 15:00:10 -08:00

xfrm4_mode_beet.c

[IPSEC]: Fix BEET output

2008-03-26 16:51:09 -07:00

xfrm4_mode_transport.c

[IPSEC]: Use IPv6 calling convention as the convention for x->mode->output

2007-10-10 16:55:54 -07:00

xfrm4_mode_tunnel.c

[IPSEC]: Fix inter address family IPsec tunnel handling.

2008-03-24 14:51:51 -07:00

xfrm4_output.c

[IPSEC]: Fix inter address family IPsec tunnel handling.

2008-03-24 14:51:51 -07:00

xfrm4_policy.c

[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.

2008-03-26 04:39:53 +09:00

xfrm4_state.c

[IPSEC]: Fix BEET output

2008-03-26 16:51:09 -07:00

xfrm4_tunnel.c

[IPCOMP]: Fix reception of incompressible packets

2008-01-31 19:27:24 -08:00