Blame SOURCES/0014-include-sync-linux-netfilter_bridge-ebt_ip.h-with-ke.patch

05e71a
From e3335b04db67142173124e28914b4fc5db2cfc38 Mon Sep 17 00:00:00 2001
05e71a
From: Matthias Schiffer <mschiffer@universe-factory.net>
05e71a
Date: Sun, 4 Mar 2018 09:28:55 +0100
05e71a
Subject: [PATCH] include: sync linux/netfilter_bridge/ebt_ip.h with kernel
05e71a
05e71a
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
05e71a
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
05e71a
Signed-off-by: Phil Sutter <psutter@redhat.com>
05e71a
---
05e71a
 include/linux/netfilter_bridge/ebt_ip.h | 16 +++++++++++++---
05e71a
 1 file changed, 13 insertions(+), 3 deletions(-)
05e71a
05e71a
diff --git a/include/linux/netfilter_bridge/ebt_ip.h b/include/linux/netfilter_bridge/ebt_ip.h
05e71a
index c4bbc41b0ea47..46d6261370b0c 100644
05e71a
--- a/include/linux/netfilter_bridge/ebt_ip.h
05e71a
+++ b/include/linux/netfilter_bridge/ebt_ip.h
05e71a
@@ -1,3 +1,4 @@
05e71a
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
05e71a
 /*
05e71a
  *  ebt_ip
05e71a
  *
05e71a
@@ -23,8 +24,10 @@
05e71a
 #define EBT_IP_PROTO 0x08
05e71a
 #define EBT_IP_SPORT 0x10
05e71a
 #define EBT_IP_DPORT 0x20
05e71a
+#define EBT_IP_ICMP 0x40
05e71a
+#define EBT_IP_IGMP 0x80
05e71a
 #define EBT_IP_MASK (EBT_IP_SOURCE | EBT_IP_DEST | EBT_IP_TOS | EBT_IP_PROTO |\
05e71a
- EBT_IP_SPORT | EBT_IP_DPORT )
05e71a
+		     EBT_IP_SPORT | EBT_IP_DPORT | EBT_IP_ICMP | EBT_IP_IGMP)
05e71a
 #define EBT_IP_MATCH "ip"
05e71a
 
05e71a
 /* the same values are used for the invflags */
05e71a
@@ -37,8 +40,15 @@ struct ebt_ip_info {
05e71a
 	__u8  protocol;
05e71a
 	__u8  bitmask;
05e71a
 	__u8  invflags;
05e71a
-	__u16 sport[2];
05e71a
-	__u16 dport[2];
05e71a
+	union {
05e71a
+		__u16 sport[2];
05e71a
+		__u8 icmp_type[2];
05e71a
+		__u8 igmp_type[2];
05e71a
+	};
05e71a
+	union {
05e71a
+		__u16 dport[2];
05e71a
+		__u8 icmp_code[2];
05e71a
+	};
05e71a
 };
05e71a
 
05e71a
 #endif
05e71a
-- 
05e71a
2.21.0
05e71a