This repository has been archived on 2026-03-14. You can view files and clone it, but cannot push or open issues or pull requests.

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

Conflicts:
	drivers/net/benet/be_main.c

2011-05-11 14:26:58 -04:00

..

netfilter

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

af_inet.c

ipv4: Use cork flow in inet_sk_{reselect_saddr,rebuild_header}()

2011-05-08 14:05:13 -07:00

ah4.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

arp.c

net: gre: provide multicast mappings for ipv4 and ipv6

2011-03-30 00:10:47 -07:00

cipso_ipv4.c

inet: add RCU protection to inet->opt

2011-04-28 13:16:35 -07:00

datagram.c

ipv4: Lock socket and use cork flow in ip4_datagram_connect().

2011-05-08 13:48:57 -07:00

devinet.c

net: fix two lockdep splats

2011-05-10 15:03:01 -07:00

esp4.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

fib_frontend.c

Disable rp_filter for IPsec packets

2011-04-10 18:50:59 -07:00

fib_lookup.h

ipv4: Fix nexthop caching wrt. scoping.

2011-03-24 18:06:47 -07:00

fib_rules.c

ipv4: Use flowi4 in FIB layer.

2011-03-12 15:08:49 -08:00

fib_semantics.c

ipv4: Fix nexthop caching wrt. scoping.

2011-03-24 18:06:47 -07:00

fib_trie.c

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

2011-05-05 14:59:02 -07:00

gre.c

tunnels: add _rcu annotations

2010-10-25 13:09:45 -07:00

icmp.c

ipv4: icmp: Eliminate remaining uses of rt->rt_src

2011-05-10 13:32:46 -07:00

igmp.c

ipv4: Use flowi4's {saddr,daddr} in igmpv3_newpack() and igmp_send_report()

2011-05-03 20:53:12 -07:00

inet_connection_sock.c

ipv4: Create inet_csk_route_child_sock().

2011-05-08 14:34:22 -07:00

inet_diag.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

inet_fragment.c

net/ipv4: EXPORT_SYMBOL cleanups

2010-07-12 12:57:54 -07:00

inet_hashtables.c

inet: Fix __inet_inherit_port() to correctly increment bsockets and num_owners

2010-11-28 18:18:44 -08:00

inet_lro.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

inet_timewait_sock.c

tcp: fix inet_twsk_deschedule()

2011-02-19 18:59:04 -08:00

inetpeer.c

inetpeer: reduce stack usage

2011-04-12 13:58:33 -07:00

ip_forward.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

ip_fragment.c

net: ip_expire() must revalidate route

2011-05-04 14:04:07 -07:00

ip_gre.c

net: call dev_alloc_name from register_netdevice

2011-05-05 10:57:45 -07:00

ip_input.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

ip_options.c

inet: add RCU protection to inet->opt

2011-04-28 13:16:35 -07:00

ip_output.c

ipv4: Pass explicit daddr arg to ip_send_reply().

2011-05-10 13:32:46 -07:00

ip_sockglue.c

inet: add RCU protection to inet->opt

2011-04-28 13:16:35 -07:00

ipcomp.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

ipconfig.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

ipip.c

net: call dev_alloc_name from register_netdevice

2011-05-05 10:57:45 -07:00

ipmr.c

ipv4: Pass explicit saddr/daddr args to ipmr_get_route().

2011-05-04 12:18:54 -07:00

Kconfig

ipv4: Remove fib_hash.

2011-02-01 15:35:25 -08:00

Makefile

ipv4: Remove fib_hash.

2011-02-01 15:35:25 -08:00

netfilter.c

netfilter: af_info: add 'strict' parameter to limit lookup to .oif

2011-04-04 17:00:54 +02:00

proc.c

tcp: Replace time wait bucket msg by counter

2010-12-08 12:16:33 -08:00

protocol.c

net: add __rcu annotations to protocol

2010-10-27 11:37:31 -07:00

raw.c

ipv4: Pass flow key down into ip_append_*().

2011-05-08 21:24:07 -07:00

route.c

ipv4: Pass explicit saddr/daddr args to ipmr_get_route().

2011-05-04 12:18:54 -07:00

syncookies.c

inet: add RCU protection to inet->opt

2011-04-28 13:16:35 -07:00

sysctl_net_ipv4.c

net: Do not wrap sysctl igmp_max_memberships in IP_MULTICAST

2011-04-12 13:59:33 -07:00

tcp_bic.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_cong.c

net/ipv4: Eliminate kstrdup memory leak

2010-08-27 19:31:56 -07:00

tcp_cubic.c

tcp_cubic: limit delayed_ack ratio to prevent divide error

2011-05-08 15:51:57 -07:00

tcp_diag.c

tcp: diag: Dont report negative values for rx queue

2009-12-03 16:06:13 -08:00

tcp_highspeed.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_htcp.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_hybla.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_illinois.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_input.c

tcp: Make undo_ssthresh arg to tcp_undo_cwr() a bool.

2011-03-22 19:37:11 -07:00

tcp_ipv4.c

ipv4: Pass explicit daddr arg to ip_send_reply().

2011-05-10 13:32:46 -07:00

tcp_lp.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

tcp_minisocks.c

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

2010-12-08 13:47:38 -08:00

tcp_output.c

inet: Pass flowi to ->queue_xmit().

2011-05-08 15:28:28 -07:00

tcp_probe.c

net: ipv4: tcp_probe: cleanup snprintf() use

2010-11-17 12:27:46 -08:00

tcp_scalable.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_timer.c

tcp: Remove debug macro of TCP_CHECK_TIMER

2011-02-20 11:10:14 -08:00

tcp_vegas.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -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: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_westwood.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_yeah.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

tcp.c

net: Allow no-cache copy from user on transmit

2011-04-04 22:30:30 -07:00

tunnel4.c

tunnels: add __rcu annotations

2010-10-27 11:37:32 -07:00

udp_impl.h

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

udp.c

ipv4: udp: Eliminate remaining uses of rt->rt_src

2011-05-10 13:32:47 -07:00

udplite.c

net: fix nulls list corruptions in sk_prot_alloc

2010-12-16 14:26:56 -08:00

xfrm4_input.c

net/ipv4: EXPORT_SYMBOL cleanups

2010-07-12 12:57:54 -07:00

xfrm4_mode_beet.c

ipsec: Interfamily IPSec BEET

2008-08-06 02:39:30 -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

ipv4: Don't pre-seed hoplimit metric.

2010-12-12 22:08:17 -08:00

xfrm4_output.c

xfrm: Assign the inner mode output function to the dst entry

2011-05-10 15:03:34 -07:00

xfrm4_policy.c

ipv4: xfrm: Eliminate ->rt_src reference in policy code.

2011-05-10 13:32:48 -07:00

xfrm4_state.c

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

2011-05-11 14:26:58 -04:00

xfrm4_tunnel.c

net: struct xfrm_tunnel in read_mostly section

2010-08-30 13:50:45 -07:00