patch-2.3.15 linux/net/sched/cls_fw.c

Next file: linux/net/sched/cls_u32.c
Previous file: linux/net/sched/cls_api.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.14/linux/net/sched/cls_fw.c linux/net/sched/cls_fw.c
@@ -33,6 +33,7 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/notifier.h>
+#include <linux/netfilter.h>
 #include <net/ip.h>
 #include <net/route.h>
 #include <linux/skbuff.h>
@@ -64,8 +65,8 @@
 {
 	struct fw_head *head = (struct fw_head*)tp->root;
 	struct fw_filter *f;
-#ifdef CONFIG_IP_FIREWALL
-	u32 id = skb->fwmark;
+#ifdef CONFIG_NETFILTER
+	u32 id = (skb->nfreason == NF_REASON_FOR_CLS_FW ? skb->nfmark : 0);
 #else
 	u32 id = 0;
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)