David S. Miller
90d0e08e57
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next ...
Pablo Neira Ayuso says:
====================
Netfilter/IPVS updates for net-next
This small patchset contains three accumulated Netfilter/IPVS updates,
they are:
1) Refactorize common NAT code by encapsulating it into a helper
function, similarly to what we do in other conntrack extensions,
from Florian Westphal.
2) A minor format string mismatch fix for IPVS, from Masanari Iida.
3) Add quota support to the netfilter accounting infrastructure, now
you can add quotas to accounting objects via the nfnetlink interface
and use them from iptables. You can also listen to quota
notifications from userspace. This enhancement from Mathieu Poirier.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-30 17:54:47 -07:00
9pnet: p9_client->conn field is unused. Remove it.
2014-03-25 16:38:16 -05:00
Bluetooth: Keep msec in DISCOV_LE_TIMEOUT
2014-03-28 00:09:30 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2014-05-30 17:54:47 -07:00
ipv4: make ip_local_reserved_ports per netns
2014-05-14 15:31:45 -04:00
NFC: Add RAW socket type support for SOCKPROTO_RAW
2014-05-20 00:06:04 +02:00
net: sctp: cache auth_enable per endpoint
2014-04-18 18:32:00 -04:00
net_sched: act: hide struct tcf_common from API
2014-02-12 19:23:32 -05:00
6lowpan: include net/net_namespace.h on 6lowpan namepsace header
2014-04-20 18:18:55 -04:00
net_sched: act: refuse to remove bound action outside
2014-02-12 19:23:32 -05:00
net: ipv6: Introduce ip6_sk_dst_hoplimit.
2014-04-30 13:31:26 -04:00
ieee802154: add dgram sockopts for security control
2014-05-16 17:23:41 -04:00
vsock: Make transport the proto owner
2014-05-05 13:13:50 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
2014-05-22 13:58:36 -04:00
net: Allow csum_add to be provided in arch
2014-05-05 15:26:29 -04:00
cgroup: clean up cgroup_subsys names and initialization
2014-02-08 10:36:58 -05:00
net: Move prototype declaration to header file include/net/datalink.h from net/ipx/af_ipx.c
2014-02-09 17:32:50 -08:00
net: Move prototype declaration to header file include/net/dn.h from net/decnet/af_decnet.c
2014-02-09 17:32:49 -08:00
net: Move prototype declaration to appropriate header file from decnet/af_decnet.c
2014-02-09 17:32:49 -08:00
net: dsa: add ds_to_priv
2014-04-30 13:31:25 -04:00
ipv4: add a sock pointer to dst->output() path.
2014-04-15 13:47:15 -04:00
net: ethoc: set up MII management bus clock
2014-02-04 20:19:51 -08:00
ipv4, fib: pass LOOPBACK_IFINDEX instead of 0 to flowi4_iif
2014-04-16 15:05:11 -04:00
flowcache: Make flow cache name space aware
2014-02-12 07:02:11 +01:00
mac80211: propagate STBC / LDPC flags to radiotap
2014-02-06 09:34:58 +01:00
ieee802154: add definitions for link-layer security and header functions
2014-05-15 15:51:42 -04:00
ieee802154, mac802154: implement devkey record option
2014-05-16 17:23:42 -04:00
ipv6: move DAD and addrconf_verify processing to workqueue
2014-03-28 16:54:50 -04:00
ipv4: add a sock pointer to ip_queue_xmit()
2014-04-15 12:58:34 -04:00
ipv4: add a sock pointer to ip_queue_xmit()
2014-04-15 12:58:34 -04:00
tunnel: fix RFC number in comment for INET_ECN_decapsulate()
2014-05-07 15:30:52 -04:00
net: Use a more standard macro for INET_ADDR_COOKIE
2014-05-14 16:07:23 -04:00
net: support marking accepting TCP sockets
2014-05-13 18:35:09 -04:00
net: Fix CONFIG_SYSCTL ifdef test.
2014-05-15 13:43:14 -04:00
net: Call skb_checksum_init in IPv6
2014-05-05 15:26:30 -04:00
ipv6: do not overwrite inetpeer metrics prematurely
2014-03-27 15:09:07 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-05-24 00:32:30 -04:00
ipv4: add a sock pointer to dst->output() path.
2014-04-15 13:47:15 -04:00
net: add a sysctl to reflect the fwmark on replies
2014-05-13 18:35:08 -04:00
net: Move prototype declaration to header file include/net/ipx.h from net/ipx/af_ipx.c
2014-02-09 17:32:50 -08:00
mac80211: export the expected throughput
2014-05-21 09:15:16 +02:00
ieee802154: add header structs with endiannes and operations
2014-03-14 22:15:26 -04:00
6lowpan: nuke net_ieee802154_lowpan() accessor when 6lowpan is disabled
2014-04-24 12:36:00 -04:00
cgroup: clean up cgroup_subsys names and initialization
2014-02-08 10:36:58 -05:00
ieee802154: use ieee802154_addr instead of *_sa variants
2014-03-14 22:15:26 -04:00
sched, cls: check if we could overwrite actions when changing a filter
2014-04-27 23:42:39 -04:00
net: Eliminate no_check from protosw
2014-05-23 16:28:53 -04:00
cfg80211: Enable GO operation on additional channels
2014-04-09 10:55:34 +02:00
ipv4: remove ip_rt_dump from route.c
2014-03-24 12:45:01 -04:00
rtnl: make ifla_policy static
2014-02-18 18:15:42 -05:00
sched, cls: check if we could overwrite actions when changing a filter
2014-04-27 23:42:39 -04:00
net: clean up snmp stats code
2014-05-07 16:06:05 -04:00
net: Split sk_no_check into sk_no_check_{rx,tx}
2014-05-23 16:28:53 -04:00
tcp: make cwnd-limited checks measurement-based, and gentler
2014-05-22 12:04:49 -04:00
net: Add a software TSO helper API
2014-05-22 14:57:15 -04:00
net: Split sk_no_check into sk_no_check_{rx,tx}
2014-05-23 16:28:53 -04:00
vxlan: add x-netns support
2014-04-24 16:18:26 -04:00
ieee802154: add netlink APIs for smartMAC configuration
2014-02-17 16:42:39 -05:00
xfrm: Remove useless xfrm_audit struct.
2014-04-23 08:21:04 +02:00
90d0e08e57