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

Conflicts:
	drivers/infiniband/hw/cxgb4/device.c

The cxgb4 conflict was simply overlapping changes.

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

2014-07-22 00:44:59 -07:00

..

netfilter

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

2014-07-20 21:01:43 -07:00

addrconf_core.c

net: clean up snmp stats code

2014-05-07 16:06:05 -04:00

addrconf.c

ipv6: addrconf: implement address generation modes

2014-07-11 15:05:45 -07:00

addrlabel.c

ipv6:fix checkpatch errors with assignment in if condition

2014-02-17 16:57:29 -05:00

af_inet6.c

ipv6: Implement automatic flow label generation on transmit

2014-07-07 21:14:21 -07:00

ah6.c

ah6: Use the IPsec protocol multiplexer API

2014-03-14 07:28:07 +01:00

anycast.c

ipv6: enable anycast addresses as source addresses for datagrams

2014-01-22 21:57:05 -08:00

datagram.c

net: Save TX flow hash in sock and set in skbuf on xmit

2014-07-07 21:14:21 -07:00

esp6.c

esp6: Use the IPsec protocol multiplexer API

2014-03-14 07:28:07 +01:00

exthdrs_core.c

ipv6: ipv6_find_hdr restore prev functionality

2014-02-27 18:27:26 -05:00

exthdrs_offload.c

ipv6: Fix exthdrs offload registration.

2014-03-06 16:35:55 -05:00

exthdrs.c

ipv6/exthdrs: accept tlv which includes only padding

2013-09-11 15:52:27 -04:00

fib6_rules.c

ipv6: move IPV6_TCLASS_SHIFT into ipv6.h and define a helper

2014-01-15 15:53:18 -08:00

icmp.c

net: add a sysctl to reflect the fwmark on replies

2014-05-13 18:35:08 -04:00

inet6_connection_sock.c

net: support marking accepting TCP sockets

2014-05-13 18:35:09 -04:00

inet6_hashtables.c

inet: convert inet_ehash_secret and ipv6_hash_secret to net_get_random_once

2013-10-19 19:45:35 -04:00

ip6_checksum.c

udp: Generic functions to set checksum

2014-06-04 22:46:38 -07:00

ip6_fib.c

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

2014-05-12 13:19:14 -04:00

ip6_flowlabel.c

net: ipv6: Introduce ip6_sk_dst_hoplimit.

2014-04-30 13:31:26 -04:00

ip6_gre.c

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

ip6_icmp.c

ipv6: Kill ipv6 dependency of icmpv6_send().

2013-04-29 13:54:36 -04:00

ip6_input.c

net: Fix memory leak if TPROXY used with TCP early demux

2014-01-27 16:22:11 -08:00

ip6_offload.c

gre: Call gso_make_checksum

2014-06-04 22:46:38 -07:00

ip6_offload.h

ipv6: Pull IPv6 GSO registration out of the module

2012-11-15 17:39:24 -05:00

ip6_output.c

net-timestamp: SOCK_RAW and PING timestamping

2014-07-15 16:32:45 -07:00

ip6_tunnel.c

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

ip6_vti.c

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

ip6mr.c

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

ipcomp6.c

ipcomp6: Use the IPsec protocol multiplexer API

2014-03-14 07:28:07 +01:00

ipv6_sockglue.c

ipv6: remove unnecessary break after return

2014-07-15 16:27:01 -07:00

Kconfig

ip6_vti: Fix build when NET_IP_TUNNEL is not set.

2014-02-20 14:29:49 +01:00

Makefile

xfrm6: Add IPsec protocol multiplexer

2014-03-14 07:28:07 +01:00

mcast.c

ipv6: Fix MLD Query message check

2014-06-27 00:21:50 -07:00

mip6.c

ipv4/ipv6: Fix FSF address in file headers

2013-12-06 12:37:56 -05:00

ndisc.c

ipv6: fix the check when handle RA

2014-07-10 16:56:33 -07:00

netfilter.c

netfilter: Fix potential use after free in ip6_route_me_harder()

2014-05-09 02:36:39 +02:00

output_core.c

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

2014-06-11 16:02:55 -07:00

ping.c

net: Eliminate no_check from protosw

2014-05-23 16:28:53 -04:00

proc.c

snmp: fix some left over of snmp stats

2014-05-14 15:33:47 -04:00

protocol.c

net: remove outdated comment for ipv4 and ipv6 protocol handler

2013-11-28 18:47:51 -05:00

raw.c

net: ipv6: Use BUG_ON

2014-07-11 15:06:38 -07:00

reassembly.c

ipv6: split inet6_hash_frag for netfilter and initialize secrets with net_get_random_once

2013-10-23 17:01:40 -04:00

route.c

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

2014-05-24 00:32:30 -04:00

sit.c

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

syncookies.c

net: remove inet6_reqsk_alloc

2014-06-27 15:53:35 -07:00

sysctl_net_ipv6.c

ipv6: Implement automatic flow label generation on transmit

2014-07-07 21:14:21 -07:00

tcp_ipv6.c

net: Save TX flow hash in sock and set in skbuf on xmit

2014-07-07 21:14:21 -07:00

tcpv6_offload.c

net-gre-gro: Fix a bug that breaks the forwarding path

2014-07-16 14:45:26 -07:00

tunnel6.c

ipv4/ipv6: Fix FSF address in file headers

2013-12-06 12:37:56 -05:00

udp_impl.h

net: ipv4/ipv6: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

udp_offload.c

gre: Call gso_make_checksum

2014-06-04 22:46:38 -07:00

udp.c

udp: Use hash2 for long hash1 chains in __udp*_lib_mcast_deliver.

2014-07-16 23:29:52 -07:00

udplite.c

net: Eliminate no_check from protosw

2014-05-23 16:28:53 -04: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

ipv4/ipv6: Fix FSF address in file headers

2013-12-06 12:37:56 -05: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

xfrm6: Remove xfrm_tunnel_notifier

2014-03-14 07:28:08 +01:00

xfrm6_output.c

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

2014-05-24 00:32:30 -04:00

xfrm6_policy.c

xfrm6: Add IPsec protocol multiplexer

2014-03-14 07:28:07 +01:00

xfrm6_protocol.c

xfrm6: Properly handle unsupported protocols

2014-05-06 07:08:38 +02:00

xfrm6_state.c

xfrm: make local error reporting more robust

2013-08-14 13:07:12 +02:00

xfrm6_tunnel.c

ipv4/ipv6: Fix FSF address in file headers

2013-12-06 12:37:56 -05:00