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

The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.

The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.

Conflicts:
	drivers/net/ethernet/nvidia/forcedeth.c
	drivers/net/wireless/libertas/cfg.c

2011-11-21 13:50:33 -05:00

..

netfilter

netfilter: Remove unnecessary OOM logging messages

2011-11-01 09:19:49 +01: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

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

addrlabel.c

rtnetlink: Compute and store minimum ifinfo dump size

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

af_inet6.c

net: introduce and use netdev_features_t for device features sets

2011-11-16 17:43:10 -05:00

ah6.c

ah: Don't return NET_XMIT_DROP on input.

2011-11-12 18:13:32 -05:00

anycast.c

inet: constify ip headers and in6_addr

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

datagram.c

net: make ipv6 PKTINFO honour freebind

2011-11-08 15:13:03 -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

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

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

exthdrs.c

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

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

fib6_rules.c

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

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

icmp.c

net: more accurate skb truesize

2011-10-13 16:05:07 -04:00

inet6_connection_sock.c

ipv6: tcp: fix TCLASS value in ACK messages sent from TIME_WAIT

2011-10-27 00:44:35 -04: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: Use pr_warn() in ip6_fib.c

2011-11-17 03:18:28 -05:00

ip6_flowlabel.c

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

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

ip6_input.c

ipv6: drop packets when source address is multicast

2011-11-08 12:37:06 -05:00

ip6_output.c

ipv6: Remove all uses of LL_ALLOCATED_SPACE

2011-11-18 14:37:09 -05:00

ip6_tunnel.c

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

2011-11-21 13:50:33 -05:00

ip6mr.c

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

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

ipcomp6.c

inet: constify ip headers and in6_addr

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

ipv6_sockglue.c

net: allow CAP_NET_RAW to set socket options IP{,V6}_TRANSPARENT

2011-10-20 18:21:36 -04: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: Remove all uses of LL_ALLOCATED_SPACE

2011-11-18 14:37:09 -05:00

mip6.c

inet: constify ip headers and in6_addr

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

ndisc.c

ipv6: Remove all uses of LL_ALLOCATED_SPACE

2011-11-18 14:37:09 -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: reduce percpu needs for icmpv6msg mibs

2011-11-14 00:12:26 -05:00

protocol.c

net: add __rcu annotations to protocol

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

raw.c

ipv6: Remove all uses of LL_ALLOCATED_SPACE

2011-11-18 14:37:09 -05:00

reassembly.c

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

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

route.c

IPv6 routing, NLM_F_* flag support: warn if new route is created without NLM_F_CREATE

2011-11-14 14:35:33 -05:00

sit.c

net: better pcpu data alignment

2011-11-08 15:10:59 -05:00

syncookies.c

tcp: add const qualifiers where possible

2011-10-21 05:22:42 -04: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: make the tcp and udp file_operations for the /proc stuff const

2011-11-01 17:56:14 -04: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

net: introduce and use netdev_features_t for device features sets

2011-11-16 17:43:10 -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

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07: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

inet: constify ip headers and in6_addr

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

xfrm6_output.c

xfrm6: Don't call icmpv6_send on local error

2011-10-18 23:53:10 -04:00

xfrm6_policy.c

inet: constify ip headers and in6_addr

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

xfrm6_state.c

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

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

xfrm6_tunnel.c

ipv6: Fix return of xfrm6_tunnel_rcv()

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