David S. Miller
e11607aad5
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf ...
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for your net tree, a
rather large batch of fixes targeted to nf_tables, conntrack and bridge
netfilter. More specifically, they are:
1) Don't track fragmented packets if the socket option IP_NODEFRAG is set.
From Florian Westphal.
2) SCTP protocol tracker assumes that ICMP error messages contain the
checksum field, what results in packet drops. From Ying Xue.
3) Fix inconsistent handling of AH traffic from nf_tables.
4) Fix new bitmap set representation with big endian. Fix mismatches in
nf_tables due to incorrect big endian handling too. Both patches
from Liping Zhang.
5) Bridge netfilter doesn't honor maximum fragment size field, cap to
largest fragment seen. From Florian Westphal.
6) Fake conntrack entry needs to be aligned to 8 bytes since the 3 LSB
bits are now used to store the ctinfo. From Steven Rostedt.
7) Fix element comments with the bitmap set type. Revert the flush
field in the nft_set_iter structure, not required anymore after
fixing up element comments.
8) Missing error on invalid conntrack direction from nft_ct, also from
Liping Zhang.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-03-15 15:13:13 -07:00
9p: constify ->d_name handling
2017-01-12 04:01:17 -05:00
sched/headers: Prepare to use <linux/rcuupdate.h> instead of <linux/rculist.h> in <linux/sched.h>
2017-03-02 08:42:38 +01:00
scripts/spelling.txt: add "overide" pattern and fix typo instances
2017-03-09 17:01:09 -08:00
Revert "netfilter: nf_tables: add flush field to struct nft_set_iter"
2017-03-13 17:30:16 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2017-02-03 16:58:20 -05:00
NFC: digital: Add support for NFC DEP Response Waiting Time
2016-07-11 02:01:14 +02:00
sock: struct proto hash function may error
2016-02-11 03:54:14 -05:00
net: Work around lockdep limitation in sockets that use sockets
2017-03-09 18:23:27 -08:00
net/act_pedit: Introduce 'add' operation
2017-02-10 13:18:33 -05:00
6lowpan: add 802.15.4 short addr slaac
2016-06-15 20:41:22 -07:00
net sched actions: Add support for user cookies
2017-01-25 12:37:04 -05:00
inet: collapse ipv4/v6 rcv_saddr_equal functions into one
2017-01-18 13:04:28 -05:00
rxrpc: Rewrite the data and ack handling code
2016-09-08 11:10:12 +01:00
af_unix: split 'u->readlock' into two: 'iolock' and 'bindlock'
2016-09-04 13:29:29 -07:00
VSOCK: Introduce virtio_vsock_common.ko
2016-08-02 02:57:29 +03:00
net: add confirm_neigh method to dst_ops
2017-02-07 13:07:46 -05:00
bonding: 3ad: apply ad_actor settings changes immediately
2016-02-09 04:45:49 -05:00
netns: make struct pernet_operations::id unsigned int
2016-11-18 10:59:15 -05:00
sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>
2017-03-02 08:42:32 +01:00
calipso: Add a label cache.
2016-06-27 15:06:17 -04:00
scripts/spelling.txt: add "disassocation" pattern and fix typo instances
2017-02-27 18:43:47 -08:00
ieee802154: add netns support
2016-07-08 12:20:57 +02:00
csum: eliminate sparse warning in remcsum_unadjust()
2017-01-20 12:12:13 -05:00
netlabel: out of bound access in cipso_v4_validate()
2017-02-04 19:44:22 -05:00
cls_cgroup: get sk_classid only from full sockets
2016-04-19 20:09:25 -04:00
codel: split into multiple files
2016-04-25 16:44:27 -04:00
codel: split into multiple files
2016-04-25 16:44:27 -04:00
net_sched: fq_codel: cache skb->truesize into skb->cb
2016-06-25 12:19:35 -04:00
packet: compat support for sock_fprog
2016-06-09 23:41:03 -07:00
devlink: Add E-Switch inline mode control
2016-11-24 16:01:14 -05:00
net: dsa: remove unnecessary phy*.h includes
2017-02-10 13:51:04 -05:00
net: rename dst_neigh_output back to neigh_output
2017-02-11 21:25:18 -05:00
net: add dst_cache support
2016-02-16 20:21:48 -05:00
net/dst: Add dst port to dst_metadata utility functions
2016-11-09 13:41:54 -05:00
net: add confirm_neigh method to dst_ops
2017-02-07 13:07:46 -05:00
net: core: add UID to flows, rules, and routes
2016-11-04 14:45:23 -04:00
Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-12-12 19:25:04 -08:00
flow disector: ARP support
2017-01-11 11:02:47 -05:00
net/flowcache: Convert to hotplug state machine
2016-11-09 23:45:28 +01:00
fou: Add encap ops for IPv6 tunnels
2016-05-20 18:03:16 -04:00
fq.h: Port memory limit mechanism from fq_codel
2016-09-30 13:29:21 +02:00
fq.h: Port memory limit mechanism from fq_codel
2016-09-30 13:29:21 +02:00
net_sched: gen_estimator: complete rewrite of rate estimators
2016-12-05 15:21:59 -05:00
genetlink: Make family a signed integer.
2016-11-13 12:14:59 -05:00
net: Remove deprecated tunnel specific UDP offload functions
2016-06-17 20:23:32 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-08-18 01:17:32 -04:00
gro_cells: move to net/core/gro_cells.c
2017-02-08 14:38:18 -05:00
gtp: #define #define _GTP_H_ and not #define _GTP_H
2016-07-25 17:55:43 -07:00
net: add a hardware buffer management helper API
2016-03-14 12:19:46 -04:00
net: snmp: kill STATS_BH macros
2016-04-27 22:48:25 -04:00
wireless: radiotap: rewrite the radiotap header file
2017-01-25 16:00:33 +01:00
mac802154: constify ieee802154_llsec_ops structure
2016-01-04 20:40:41 +01:00
net/ipv6: allow sysctl to change link-local address generation mode
2017-01-27 10:25:34 -05:00
net: Introduce ife encapsulation module
2017-02-03 15:16:45 -05:00
inet: drop ->bind_conflict
2017-01-18 13:04:28 -05:00
tcp/dccp: do not touch listener sk_refcnt under synflood
2016-04-04 22:11:20 -04:00
net: Work around lockdep limitation in sockets that use sockets
2017-03-09 18:23:27 -08:00
net: Work around lockdep limitation in sockets that use sockets
2017-03-09 18:23:27 -08:00
ipv6: suppress sparse warnings in IP6_ECN_set_ce()
2016-08-13 15:08:00 -07:00
net: remove bh disabling around percpu_counter accesses
2017-01-20 11:27:22 -05:00
inet: reset tb->fastreuseport when adding a reuseport sk
2017-01-18 13:04:29 -05:00
net/tcp-fastopen: Add new API support
2017-01-25 14:04:38 -05:00
ipv4: Namespaceify tcp_tw_recycle and tcp_max_tw_buckets knob
2016-12-29 11:38:31 -05:00
Introduce a sysctl that modifies the value of PROT_SOCK.
2017-01-24 12:10:51 -05:00
ipv6: Pass proto to csum_ipv6_magic as __u8 instead of unsigned short
2016-03-13 23:55:13 -04:00
net: ipv6: Allow shorthand delete of all nexthops in multipath route
2017-02-04 19:58:14 -05:00
net: inet: Support UID-based routing in IP protocols.
2016-11-04 14:45:23 -04:00
ip6_tunnel: Clear IP6CB in ip6tunnel_xmit()
2016-11-02 15:18:36 -04:00
ipv4: fib: Add events for FIB replace and append
2017-02-10 11:32:13 -05:00
ip_tunnels: new IP_TUNNEL_INFO_BRIDGE flag for ip_tunnel_info mode
2017-02-03 15:21:21 -05:00
ipvs: free ip_vs_dest structs when refcnt=0
2017-02-02 14:31:57 +01:00
ipv6: fix flow labels when the traffic class is non-0
2017-01-31 13:16:59 -05:00
wext: uninline stream addition functions
2017-01-13 09:38:42 +01:00
kcm: Use stream parser
2016-08-17 19:36:23 -04:00
net: ipv4: Do not drop to make_route if oif is l3mdev
2016-10-13 12:05:26 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-02-11 02:31:11 -05:00
scripts/spelling.txt: add "an user" pattern and fix typo instances
2017-02-27 18:43:46 -08:00
ieee802154: cleanup WARN_ON for fc fetch
2016-07-08 13:23:12 +02:00
openvswitch: use mpls_hdr
2016-10-03 02:00:22 -04:00
net/ncsi: Introduce ncsi_stop_dev()
2016-10-04 02:11:51 -04:00
net: add confirm_neigh method to dst_ops
2017-02-07 13:07:46 -05:00
net: rename dst_neigh_output back to neigh_output
2017-02-11 21:25:18 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-22 13:27:16 -05:00
neigh: Send a notification when DELAY_PROBE_TIME changes
2016-07-05 09:06:29 -07:00
netlabel: Implement CALIPSO config functions for SMACK.
2016-06-27 15:06:18 -04:00
net: ipv6: Change notifications for multipath add to RTA_MULTIPATH
2017-02-04 19:58:14 -05:00
ieee802154: add netns support
2016-07-08 12:20:57 +02:00
net: ping: make ping_v6_sendmsg static
2016-03-23 22:09:58 -04:00
net/sched: Reflect HW offload status
2017-02-17 12:08:05 -05:00
net: make default TX queue length a defined constant
2016-11-07 20:15:55 -05:00
pptp: Refactor the struct and macros of PPTP codes
2016-08-15 10:55:53 -07:00
udp: Remove udp_offloads
2016-04-07 16:53:30 -04:00
net: Introduce psample, a new genetlink channel for packet sampling
2017-01-24 13:44:28 -05:00
net: ip, diag -- Add diag interface for raw sockets
2016-10-23 19:35:24 -04:00
net: ip, diag -- Add diag interface for raw sockets
2016-10-23 19:35:24 -04:00
ktime: Get rid of the union
2016-12-25 17:21:22 +01:00
ipv4: Namespaceify tcp_max_syn_backlog knob
2016-12-29 11:38:31 -05:00
net: inet: Support UID-based routing in IP protocols.
2016-11-04 14:45:23 -04:00
net: AF-specific RTM_GETSTATS attributes
2017-01-17 14:38:43 -05:00
sched: move tcf_proto_destroy and tcf_destroy_chain helpers into cls_api
2017-02-10 11:38:08 -05:00
sched/headers: Prepare to remove <linux/cred.h> inclusion from <linux/sched.h>
2017-03-02 08:42:31 +01:00
tcp: randomize tcp timestamp offsets for each connection
2016-12-02 12:49:59 -05:00
ipv6: sr: add core files for SR HMAC support
2016-11-09 20:40:06 -05:00
ipv6: sr: add core files for SR HMAC support
2016-11-09 20:40:06 -05:00
smc: netlink interface for SMC sockets
2017-01-09 16:07:41 -05:00
net: snmp: fix 64bit stats on 32bit arches
2016-04-28 11:49:45 -04:00
net: Work around lockdep limitation in sockets that use sockets
2017-03-09 18:23:27 -08:00
soreuseport: fix NULL ptr dereference SO_REUSEPORT after bind
2016-01-19 14:44:23 -05:00
kcm: Remove TCP specific references from kcm and strparser
2016-08-28 23:32:41 -04:00
switchdev: bridge: Offload mc router ports
2017-02-10 11:46:39 -05:00
net/tcp-fastopen: Add new API support
2017-01-25 14:04:38 -05:00
ipv6: add new struct ipcm6_cookie
2016-05-03 16:08:14 -04:00
inet: collapse ipv4/v6 rcv_saddr_equal functions into one
2017-01-18 13:04:28 -05:00
vxlan: Add new UDP encapsulation offload type for VXLAN-GPE
2016-06-17 20:23:32 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-12-16 10:24:44 -08:00
vxlan: remove unsed vxlan_dev_dst_port()
2016-11-15 12:16:13 -05:00
esp: Add a software GRO codepath
2017-02-15 11:04:11 +01:00
e11607aad5