David S. Miller
ca69d7102f
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next ...
Pablo Neira Ayuso says:
====================
Netfilter updates for net-next
The following patchset contains Netfilter updates for your net-next tree.
They are:
* nf_tables set timeout infrastructure from Patrick Mchardy.
1) Add support for set timeout support.
2) Add support for set element timeouts using the new set extension
infrastructure.
4) Add garbage collection helper functions to get rid of stale elements.
Elements are accumulated in a batch that are asynchronously released
via RCU when the batch is full.
5) Add garbage collection synchronization helpers. This introduces a new
element busy bit to address concurrent access from the netlink API and the
garbage collector.
5) Add timeout support for the nft_hash set implementation. The garbage
collector peridically checks for stale elements from the workqueue.
* iptables/nftables cgroup fixes:
6) Ignore non full-socket objects from the input path, otherwise cgroup
match may crash, from Daniel Borkmann.
7) Fix cgroup in nf_tables.
8) Save some cycles from xt_socket by skipping packet header parsing when
skb->sk is already set because of early demux. Also from Daniel.
* br_netfilter updates from Florian Westphal.
9) Save frag_max_size and restore it from the forward path too.
10) Use a per-cpu area to restore the original source MAC address when traffic
is DNAT'ed.
11) Add helper functions to access physical devices.
12) Use these new physdev helper function from xt_physdev.
13) Add another nf_bridge_info_get() helper function to fetch the br_netfilter
state information.
14) Annotate original layer 2 protocol number in nf_bridge info, instead of
using kludgy flags.
15) Also annotate the pkttype mangling when the packet travels back and forth
from the IP to the bridge layer, instead of using a flag.
* More nf_tables set enhancement from Patrick:
16) Fix possible usage of set variant that doesn't support timeouts.
17) Avoid spurious "set is full" errors from Netlink API when there are pending
stale elements scheduled to be released.
18) Restrict loop checks to set maps.
19) Add support for dynamic set updates from the packet path.
20) Add support to store optional user data (eg. comments) per set element.
BTW, I have also pulled net-next into nf-next to anticipate the conflict
resolution between your okfn() signature changes and Florian's br_netfilter
updates.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-04-09 14:46:04 -04:00
net/9p: remove a comment about pref member which doesn't exist
2014-11-06 14:59:19 -05:00
Bluetooth: Convert local OOB data reading to use HCI request
2015-04-02 16:09:29 +02:00
caif: fix a signedness bug in cfpkt_iterate()
2015-02-20 17:35:14 -05:00
irda: Convert function pointer arrays and uses to const
2014-12-10 15:33:16 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-04-08 18:30:21 +02:00
ipv6: introduce idgen_delay and idgen_retries knobs
2015-03-23 22:12:09 -04:00
nfc: nci: Add comment to explain NCI_HCI_MAX_PIPES
2015-04-06 00:19:05 +02:00
sctp: avoid to repeatedly declare external variables
2015-03-25 11:40:16 -04:00
act_bpf: add initial eBPF support for actions
2015-03-20 19:10:44 -04:00
ieee802154: 6lowpan: rename process_data and lowpan_process_data
2014-10-27 15:51:16 +01:00
net: ipv6: allow explicitly choosing optimistic addresses
2015-02-05 15:37:41 -08:00
ieee802154: mac802154: remove FSF address
2014-10-25 08:07:30 +02:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
ipsec: Remove obsolete MAX_AH_AUTH_LEN
2014-09-18 10:54:36 +02:00
neigh: Factor out ___neigh_lookup_noref
2015-03-04 00:23:23 -05:00
ax25: Stop using magic neighbour cache operations.
2015-03-03 14:44:41 -05:00
bonding: Implement port churn-machine (AD standard 43.4.17).
2015-02-24 16:05:48 -05:00
net: Move bonding headers under include/net
2014-11-10 13:27:49 -05:00
net: Move bonding headers under include/net
2014-11-10 13:27:49 -05:00
net/bonding: Fix potential bad memory access during bonding events
2015-02-09 14:03:53 -08:00
Lots of updates for net-next; along with the usual flurry
2015-03-31 16:39:04 -04:00
nl802154: introduce support for cca settings
2014-12-19 00:19:23 +01:00
net: Fix remcsum in GRO path to not change packet
2015-02-11 15:12:09 -08:00
cipso: don't use IPCB() to locate the CIPSO IP option
2015-02-11 14:46:37 -05:00
net: use ktime_get_ns() and ktime_get_real_ns() helpers
2014-08-22 19:57:23 -07:00
fold verify_iovec() into copy_msghdr_from_user()
2014-11-19 16:23:49 -05:00
net/dcb: Add IEEE QCN attribute
2015-03-06 21:50:02 -05:00
netfilter: Pass socket pointer down through okfn().
2015-04-07 15:25:55 -04:00
net: dsa: Add basic framework to support ndo_fdb functions
2015-03-29 13:23:54 -07:00
xfrm: release dst_orig in case of error in xfrm_lookup()
2015-02-12 07:10:56 +01:00
net: Remove protocol from struct dst_ops
2015-03-09 16:06:10 -04:00
net: Kill hold_net release_net
2015-03-12 14:39:40 -04:00
flow_keys: n_proto type should be __be16
2015-02-05 00:40:22 -08:00
ip_tunnel: Ops registration for secondary encap (fou, gue)
2014-11-12 15:01:35 -05:00
net: sched: enable per cpu qstats
2014-09-30 01:02:26 -04:00
net: Introduce possible_net_t
2015-03-12 14:39:40 -04:00
openvswitch: Add support for checksums on UDP tunnels.
2015-01-28 23:04:15 -08:00
ip_tunnel: Create percpu gro_cell
2015-01-18 01:56:32 -05:00
gue: Protocol constants for remote checksum offload
2014-11-05 16:30:03 -05:00
ieee802154: rework cca setting
2014-12-19 00:19:23 +01:00
ipv6: do retries on stable privacy addresses
2015-03-23 22:12:09 -04:00
inet: get rid of central tcp/dccp listener timer
2015-03-20 12:40:25 -04:00
ipv6: get rid of __inet6_hash()
2015-03-18 22:00:35 -04:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
inet: get rid of central tcp/dccp listener timer
2015-03-20 12:40:25 -04:00
percpu_counter: add @gfp to percpu_counter_init()
2014-09-08 09:51:29 +09:00
inet: get rid of last __inet_hash_connect() argument
2015-03-18 22:00:35 -04:00
inet: fix request sock refcounting
2015-03-17 22:02:29 -04:00
net: add real socket cookies
2015-03-11 21:55:28 -04:00
tcp: simplify inetpeer_addr_base use
2015-03-31 13:58:35 -04:00
netfilter: Pass socket pointer down through okfn().
2015-04-07 15:25:55 -04:00
net: add gro_compute_pseudo functions
2014-08-24 18:09:23 -07:00
net: fib6: convert cfg metric to u32 outside of table write lock
2015-01-05 22:55:24 -05:00
netfilter: Pass socket pointer down through okfn().
2015-04-07 15:25:55 -04:00
udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().
2015-04-07 15:29:08 -04:00
ipv4: FIB Local/MAIN table collapse
2015-03-11 16:22:14 -04:00
ipip,gre,vti,sit: implement ndo_get_iflink
2015-04-02 14:05:00 -04:00
net: Introduce possible_net_t
2015-03-12 14:39:40 -04:00
net: remove extra newlines
2015-04-07 22:24:37 -04:00
switch ipxrtr_route_packet() from iovec to msghdr
2014-11-24 04:28:49 -05:00
wext: add checked wrappers for adding events/points to streams
2015-02-28 21:31:12 +01:00
lib80211: remove unused print_ssid()
2014-10-14 02:18:27 +02:00
llc: Make llc_conn_ev_qfyr_t function pointer arrays const
2014-12-10 15:21:24 -05:00
llc: Make llc_sap_action_t function pointer arrays const
2014-12-10 15:21:24 -05:00
mac80211: make sta.wme indicate whether QoS is used
2015-03-30 10:47:16 +02:00
ieee802154: cleanup ieee802154_le64_to_be64
2015-02-14 05:19:58 +01:00
ipv6: mld: answer mldv2 queries with mldv1 reports in mldv1 fallback
2014-09-22 16:23:15 -04:00
openvswitch: Add basic MPLS support to kernel
2014-11-05 23:52:33 -08:00
neigh: Factor out ___neigh_lookup_noref
2015-03-04 00:23:23 -05:00
net: neighbour: Add mcast_resolicit to configure the number of multicast resolicitations in PROBE state.
2015-03-20 21:47:40 -04:00
net: Introduce possible_net_t
2015-03-12 14:39:40 -04:00
netlabel: fix the netlbl_catmap_setlong() dummy function
2014-08-07 20:55:21 -04:00
netlink: implement nla_get_in_addr and nla_get_in6_addr
2015-03-31 13:58:35 -04:00
nl802154: introduce support for cca settings
2014-12-19 00:19:23 +01:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
net: sched: remove tcf_proto from ematch calls
2014-10-06 18:02:32 -04:00
net: rename vlan_tx_* helpers since "tx" is misleading there
2015-01-13 17:51:08 -05:00
cfg80211: allow wiphy specific regdomain management
2014-12-17 11:49:55 +01:00
net: convert syn_wait_lock to a spinlock
2015-03-23 16:52:26 -04:00
ipv4: per cpu uncached list
2015-01-15 18:26:16 -05:00
rtnl: add link netns id to interface messages
2015-01-19 14:21:26 -05:00
net_sched: destroy proto tp when all filters are gone
2015-03-09 15:35:55 -04:00
Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-10-15 07:48:18 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-06 22:34:15 -04:00
switchdev: kernel-doc cleanup on swithdev ops
2015-03-20 21:36:53 -04:00
tcp: RFC7413 option support for Fast Open client
2015-04-07 18:36:39 -04:00
inet: add TCP_NEW_SYN_RECV state
2015-03-12 22:58:12 -04:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().
2015-04-07 15:29:08 -04:00
net: switch memcpy_fromiovec()/memcpy_fromiovecend() users to copy_from_iter()
2015-02-04 01:34:15 -05:00
udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().
2015-04-07 15:29:08 -04:00
net: treewide: Fix typo found in DocBook/networking.xml
2014-09-05 17:35:28 -07:00
netfilter: Pass socket pointer down through okfn().
2015-04-07 15:25:55 -04:00
ca69d7102f