Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[sfrench/cifs-2.6.git] / net / netfilter / nf_flow_table_ip.c

diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c
index 010b0b4eb05d74dc5aa1c92f3296f63592015f79..32c0eb1b482122a7eca4171c17473a052bf4d4fb 100644 (file)
--- a/net/netfilter/nf_flow_table_ip.c
+++ b/net/netfilter/nf_flow_table_ip.c
@@ -8,8 +8,6 @@
 #include <linux/ipv6.h>
 #include <linux/netdevice.h>
 #include <linux/if_ether.h>
-#include <linux/if_pppox.h>
-#include <linux/ppp_defs.h>
 #include <net/ip.h>
 #include <net/ipv6.h>
 #include <net/ip6_route.h>
@@ -260,22 +258,6 @@ static unsigned int nf_flow_xmit_xfrm(struct sk_buff *skb,
        return NF_STOLEN;
 }
 
-static inline __be16 nf_flow_pppoe_proto(const struct sk_buff *skb)
-{
-       __be16 proto;
-
-       proto = *((__be16 *)(skb_mac_header(skb) + ETH_HLEN +
-                            sizeof(struct pppoe_hdr)));
-       switch (proto) {
-       case htons(PPP_IP):
-               return htons(ETH_P_IP);
-       case htons(PPP_IPV6):
-               return htons(ETH_P_IPV6);
-       }
-
-       return 0;
-}
-
 static bool nf_flow_skb_encap_protocol(const struct sk_buff *skb, __be16 proto,
                                       u32 *offset)
 {