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

Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c

2008-03-18 00:37:55 -07:00

..

ipvs

net: replace remaining __FUNCTION__ occurrences

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

netfilter

net: replace remaining __FUNCTION__ occurrences

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

af_inet.c

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

2008-03-18 00:37:55 -07:00

ah4.c

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

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

arp.c

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

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

cipso_ipv4.c

NetLabel: introduce a new kernel configuration API for NetLabel

2008-02-05 09:44:20 -08:00

datagram.c

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

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

devinet.c

[NETNS]: Process inet_select_addr inside a namespace.

2008-02-28 20:52:54 -08:00

esp4.c

[IPV4]: esp_output() misannotations

2008-03-17 22:50:23 -07:00

fib_frontend.c

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

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

fib_hash.c

ipv4/fib_hash.c: fix NULL dereference

2008-02-19 16:28:54 -08:00

fib_lookup.h

[IPV4] FIB_HASH: Reduce memory needs and speedup lookups

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

fib_rules.c

[IPV4]: Consolidate fib_select_default.

2008-01-28 15:11:02 -08: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

fib_trie: /proc/net/route performance improvement

2008-02-12 17:53:31 -08:00

icmp.c

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

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

igmp.c

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

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

inet_connection_sock.c

[INET]: Remove struct dst_entry *dst from request_sock_ops.rtx_syn_ack.

2008-02-29 11:43:03 -08:00

inet_diag.c

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

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

inet_fragment.c

[NETNS][FRAGS]: Make the pernet subsystem for fragments.

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

inet_hashtables.c

[INET]: Unexport inet_listen_wlock

2008-02-13 17:40:25 -08:00

inet_lro.c

[LRO] Fix lro_mgr->features checks

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

inet_timewait_sock.c

[NET]: prot_inuse cleanups and optimizations

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

inetpeer.c

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

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

ip_forward.c

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

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

ip_fragment.c

[NETNS][FRAGS]: Make the pernet subsystem for fragments.

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

ip_gre.c

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

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

ip_input.c

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

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

ip_options.c

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

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

ip_output.c

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

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

ip_sockglue.c

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

2008-03-18 00:37:55 -07:00

ipcomp.c

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

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

ipconfig.c

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

2008-03-18 00:37:55 -07: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

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

2008-03-05 18:30:47 -08: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

[UDP]: Revert udplite and code split.

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

protocol.c

[IPV4]: align inet_protos[] on SMP

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

raw.c

[RAW]: Wrong content of the /proc/net/raw6.

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

route.c

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

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

syncookies.c

[TCP]: Add IPv6 support to TCP SYN cookies

2008-03-04 15:18:21 +09:00

sysctl_net_ipv4.c

[TCP]: Fix a bug in strategy_allowed_congestion_control

2008-01-31 19:28:23 -08: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

net: replace remaining __FUNCTION__ occurrences

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

tcp_ipv4.c

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

2008-03-05 18:30:47 -08: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]: Add IPv6 support to TCP SYN cookies

2008-03-04 15:18:21 +09:00

tcp_output.c

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

2008-03-18 00:37:55 -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]: Do not purge sk_forward_alloc entirely in tcp_delack_timer().

2008-01-28 15:01:42 -08: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

[SOCK] proto: Add hashinfo member to struct proto

2008-02-03 04:28:52 -08:00

tunnel4.c

[INET]: Cleanup the xfrm4_tunnel_(un)register

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

udp_impl.h

[UDP]: Randomize port selection.

2007-10-10 16:48:31 -07:00

udp.c

[UDP]: Revert udplite and code split.

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

udplite.c

[UDP]: Revert udplite and code split.

2008-03-06 16:22:02 -08: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] xfrm4_beet_input(): fix an if()

2008-02-05 02:51:39 -08: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]: Rename tunnel-mode functions to avoid collisions with tunnels

2008-01-28 14:59:18 -08:00

xfrm4_output.c

[NETFILTER]: Introduce NF_INET_ hook values

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

xfrm4_policy.c

[NET]: should explicitely initialize atomic_t field in struct dst_ops

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

xfrm4_state.c

[IPSEC]: Kill afinfo->nf_post_routing

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

xfrm4_tunnel.c

[IPCOMP]: Fix reception of incompressible packets

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