These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / linux / netfilter_bridge.h

diff --git a/kernel/include/linux/netfilter_bridge.h b/kernel/include/linux/netfilter_bridge.h
index f2fdb5a..2ed40c4 100644 (file)
--- a/kernel/include/linux/netfilter_bridge.h
+++ b/kernel/include/linux/netfilter_bridge.h
@@ -17,17 +17,7 @@ enum nf_br_hook_priorities {
 
 #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
 
-#define BRNF_BRIDGED_DNAT              0x02
-#define BRNF_NF_BRIDGE_PREROUTING      0x08
-
-static inline unsigned int nf_bridge_mtu_reduction(const struct sk_buff *skb)
-{
-       if (skb->nf_bridge->orig_proto == BRNF_PROTO_PPPOE)
-               return PPPOE_SES_HLEN;
-       return 0;
-}
-
-int br_handle_frame_finish(struct sock *sk, struct sk_buff *skb);
+int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb);
 
 static inline void br_drop_fake_rtable(struct sk_buff *skb)
 {
@@ -70,8 +60,17 @@ nf_bridge_get_physoutdev(const struct sk_buff *skb)
 {
        return skb->nf_bridge ? skb->nf_bridge->physoutdev : NULL;
 }
+
+static inline bool nf_bridge_in_prerouting(const struct sk_buff *skb)
+{
+       return skb->nf_bridge && skb->nf_bridge->in_prerouting;
+}
 #else
 #define br_drop_fake_rtable(skb)               do { } while (0)
+static inline bool nf_bridge_in_prerouting(const struct sk_buff *skb)
+{
+       return false;
+}
 #endif /* CONFIG_BRIDGE_NETFILTER */
 
 #endif