History

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

Pablo Neira Ayuso says: ==================== Netfilter/IPVS updates for net-next The following patchset container Netfilter/IPVS update for net-next: 1) Add UDP tunnel support for ICMP errors in IPVS. Julian Anastasov says: This patchset is a followup to the commit that adds UDP/GUE tunnel: "ipvs: allow tunneling with gue encapsulation". What we do is to put tunnel real servers in hash table (patch 1), add function to lookup tunnels (patch 2) and use it to strip the embedded tunnel headers from ICMP errors (patch 3). 2) Extend xt_owner to match for supplementary groups, from Lukasz Pawelczyk. 3) Remove unused oif field in flow_offload_tuple object, from Taehee Yoo. 4) Release basechain counters from workqueue to skip synchronize_rcu() call. From Florian Westphal. 5) Replace skb_make_writable() by skb_ensure_writable(). Patchset from Florian Westphal. 6) Checksum support for gue encapsulation in IPVS, from Jacky Hu. ====================

David S. Miller committed 7 years ago

Commit c1e9e012 parents 0462eaa 29930e337 files · +389 −149Browse files

Showing the changes to include/uapi/linux (2 of 37 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/ip_vs.h +7 −0
  2. include/uapi/linux/netfilter/xt_owner.h +4 −3
include/uapi/linux/ip_vs.h+7−0
@@ -131,6 +131,11 @@ enum { · 130 unmodified lines
131 IP_VS_CONN_F_TUNNEL_TYPE_MAX,131 IP_VS_CONN_F_TUNNEL_TYPE_MAX,
132};132};
133 133
134/* Tunnel encapsulation flags */
135#define IP_VS_TUNNEL_ENCAP_FLAG_NOCSUM (0)
136#define IP_VS_TUNNEL_ENCAP_FLAG_CSUM (1 << 0)
137#define IP_VS_TUNNEL_ENCAP_FLAG_REMCSUM (1 << 1)
138
134/*139/*
135 * The struct ip_vs_service_user and struct ip_vs_dest_user are140 * The struct ip_vs_service_user and struct ip_vs_dest_user are
136 * used to set IPVS rules through setsockopt.141 * used to set IPVS rules through setsockopt.
@@ -403,6 +408,8 @@ enum { · 266 unmodified lines
403 408
404 IPVS_DEST_ATTR_TUN_PORT, /* tunnel port */409 IPVS_DEST_ATTR_TUN_PORT, /* tunnel port */
405 410
411 IPVS_DEST_ATTR_TUN_FLAGS, /* tunnel flags */
412
406 __IPVS_DEST_ATTR_MAX,413 __IPVS_DEST_ATTR_MAX,
407};414};
408 415
include/uapi/linux/netfilter/xt_owner.h+4−3
@@ -5,9 +5,10 @@ · 4 unmodified lines
5#include <linux/types.h>5#include <linux/types.h>
6 6
7enum {7enum {
8 XT_OWNER_UID = 1 << 0,8 XT_OWNER_UID = 1 << 0,
9 XT_OWNER_GID = 1 << 1,9 XT_OWNER_GID = 1 << 1,
10 XT_OWNER_SOCKET = 1 << 2,10 XT_OWNER_SOCKET = 1 << 2,
11 XT_OWNER_SUPPL_GROUPS = 1 << 3,
11};12};
12 13
13struct xt_owner_match_info {14struct xt_owner_match_info {