David S. Miller ff4783ce78 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/sfc/rx.c

Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change
the rx_buf->is_page boolean into a set of u16 flags, and another to
adjust how ->ip_summed is initialized.

Signed-off-by: David S. Miller <davem@davemloft.net>

2012-02-26 21:55:51 -05:00

..

netfilter

Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security

2012-01-14 18:36:33 -08:00

addrconf_core.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

addrconf.c

net: race condition in ipv6 forwarding and disable_ipv6 parameters

2012-01-18 16:38:34 -05:00

addrlabel.c

rtnetlink: Compute and store minimum ifinfo dump size

2011-06-09 20:38:07 -07:00

af_inet6.c

net: implement IP_RECVTOS for IP_PKTOPTIONS

2012-02-13 00:46:41 -05:00

ah6.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

anycast.c

ipv6: Remove never used function inet6_ac_check().

2012-02-01 16:14:17 -05:00

datagram.c

ipv6: helper function to get tclass

2012-02-13 00:45:38 -05:00

esp6.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

exthdrs_core.c

ipv6: Add fragment reporting to ipv6_skip_exthdr().

2011-12-03 09:35:10 -08:00

exthdrs.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

fib6_rules.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

icmp.c

ipv6: Implement IPV6_UNICAST_IF socket option.

2012-02-08 15:52:45 -05:00

inet6_connection_sock.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2011-11-26 14:47:03 -05:00

inet6_hashtables.c

net: Compute protocol sequence numbers and fragment IDs using MD5.

2011-08-06 18:33:19 -07:00

ip6_fib.c

ipv6: fib: Convert fib6_age() to dst_neigh_lookup().

2012-01-27 21:00:08 -05:00

ip6_flowlabel.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

ip6_input.c

ipv6: Add fragment reporting to ipv6_skip_exthdr().

2011-12-03 09:35:10 -08:00

ip6_output.c

ipv6: Eliminate dst_get_neighbour_noref() usage in ip6_forward().

2012-01-27 21:00:08 -05:00

ip6_tunnel.c

net: reintroduce missing rcu_assign_pointer() calls

2012-01-12 12:26:56 -08:00

ip6mr.c

ipv6: ip6_route_output() never returns NULL.

2012-02-22 15:30:14 -05:00

ipcomp6.c

inet: constify ip headers and in6_addr

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

ipv6_sockglue.c

net: implement IP_RECVTOS for IP_PKTOPTIONS

2012-02-13 00:46:41 -05:00

Kconfig

ipv6: ip6mr: support multiple tables

2010-05-11 14:40:55 +02:00

Makefile

[IPV6] MROUTE: Support multicast forwarding.

2008-04-05 22:33:38 +09:00

mcast.c

ipv6: Kill rt6i_dev and rt6i_expires defines.

2011-12-28 20:19:20 -05:00

mip6.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

ndisc.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-02-26 21:55:51 -05:00

netfilter.c

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

proc.c

ipv6: fix per device IP snmp counters

2012-01-17 23:56:18 -05:00

protocol.c

net: add __rcu annotations to protocol

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

raw.c

ipv6: Implement IPV6_UNICAST_IF socket option.

2012-02-08 15:52:45 -05:00

reassembly.c

ipv6: fix RFC5722 comment

2012-01-30 12:58:51 -05:00

route.c

ipv6: Use ipv6_addr_any()

2012-01-26 16:29:16 -05:00

sit.c

ipv6: sit: Convert to dst_neigh_lookup()

2012-01-26 15:23:21 -05:00

syncookies.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

sysctl_net_ipv6.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

tcp_ipv6.c

net: implement IP_RECVTOS for IP_PKTOPTIONS

2012-02-13 00:46:41 -05:00

tunnel6.c

tunnels: add _rcu annotations

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

udp_impl.h

net: Make setsockopt() optlen be unsigned.

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

udp.c

datagram: Add offset argument to __skb_recv_datagram

2012-02-21 14:58:57 -05:00

udplite.c

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

xfrm6_input.c

netfilter: ipv6: use NFPROTO values for NF_HOOK invocation

2010-03-25 16:00:49 +01:00

xfrm6_mode_beet.c

ipsec: be careful of non existing mac headers

2012-02-23 16:50:45 -05:00

xfrm6_mode_ro.c

[IPSEC]: Make x->lastused an unsigned long

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

xfrm6_mode_transport.c

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

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

xfrm6_mode_tunnel.c

ipsec: be careful of non existing mac headers

2012-02-23 16:50:45 -05:00

xfrm6_output.c

xfrm6: remove unneeded NULL check in __xfrm6_output()

2012-02-01 02:52:48 -05:00

xfrm6_policy.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

xfrm6_state.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

xfrm6_tunnel.c

ipv6: Fix return of xfrm6_tunnel_rcv()

2011-05-24 01:11:51 -04:00