Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / net / netfilter / xt_pkttype.c

diff --git a/net/netfilter/xt_pkttype.c b/net/netfilter/xt_pkttype.c
index d2f5320..3ac703b 100644 (file)
--- a/net/netfilter/xt_pkttype.c
+++ b/net/netfilter/xt_pkttype.c
@@ -9,8 +9,6 @@
 #include <linux/skbuff.h>
 #include <linux/if_ether.h>
 #include <linux/if_packet.h>
-#include <linux/in.h>
-#include <linux/ip.h>
 
 #include <linux/netfilter/xt_pkttype.h>
 #include <linux/netfilter/x_tables.h>
@@ -30,17 +28,9 @@ static int match(const struct sk_buff *skb,
       unsigned int protoff,
       int *hotdrop)
 {
-       u_int8_t type;
        const struct xt_pkttype_info *info = matchinfo;
 
-       if (skb->pkt_type == PACKET_LOOPBACK)
-               type = (MULTICAST(skb->nh.iph->daddr)
-                       ? PACKET_MULTICAST
-                       : PACKET_BROADCAST);
-       else
-               type = skb->pkt_type;
-
-       return (type == info->pkttype) ^ info->invert;
+       return (skb->pkt_type == info->pkttype) ^ info->invert;
 }
 
 static struct xt_match pkttype_match = {