UAPI: (Scripted) Disintegrate include/linux/netfilter_bridge

[sfrench/cifs-2.6.git] / include / linux / netfilter_bridge / ebt_802_3.h

diff --git a/include/linux/netfilter_bridge/ebt_802_3.h b/include/linux/netfilter_bridge/ebt_802_3.h
index be5be1577a56e28797db0817579ac22adc22e1e9..e17e8bfb4e8beba6e72ce72ec161528d5468ae32 100644 (file)
--- a/include/linux/netfilter_bridge/ebt_802_3.h
+++ b/include/linux/netfilter_bridge/ebt_802_3.h
@@ -1,70 +1,11 @@
 #ifndef __LINUX_BRIDGE_EBT_802_3_H
 #define __LINUX_BRIDGE_EBT_802_3_H
 
-#include <linux/types.h>
-
-#define EBT_802_3_SAP 0x01
-#define EBT_802_3_TYPE 0x02
-
-#define EBT_802_3_MATCH "802_3"
-
-/*
- * If frame has DSAP/SSAP value 0xaa you must check the SNAP type
- * to discover what kind of packet we're carrying. 
- */
-#define CHECK_TYPE 0xaa
-
-/*
- * Control field may be one or two bytes.  If the first byte has
- * the value 0x03 then the entire length is one byte, otherwise it is two.
- * One byte controls are used in Unnumbered Information frames.
- * Two byte controls are used in Numbered Information frames.
- */
-#define IS_UI 0x03
-
-#define EBT_802_3_MASK (EBT_802_3_SAP | EBT_802_3_TYPE | EBT_802_3)
-
-/* ui has one byte ctrl, ni has two */
-struct hdr_ui {
-       __u8 dsap;
-       __u8 ssap;
-       __u8 ctrl;
-       __u8 orig[3];
-       __be16 type;
-};
-
-struct hdr_ni {
-       __u8 dsap;
-       __u8 ssap;
-       __be16 ctrl;
-       __u8  orig[3];
-       __be16 type;
-};
-
-struct ebt_802_3_hdr {
-       __u8  daddr[6];
-       __u8  saddr[6];
-       __be16 len;
-       union {
-               struct hdr_ui ui;
-               struct hdr_ni ni;
-       } llc;
-};
-
-#ifdef __KERNEL__
 #include <linux/skbuff.h>
+#include <uapi/linux/netfilter_bridge/ebt_802_3.h>
 
 static inline struct ebt_802_3_hdr *ebt_802_3_hdr(const struct sk_buff *skb)
 {
        return (struct ebt_802_3_hdr *)skb_mac_header(skb);
 }
 #endif
-
-struct ebt_802_3_info {
-       __u8  sap;
-       __be16 type;
-       __u8  bitmask;
-       __u8  invflags;
-};
-
-#endif