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

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

diff -u --recursive --new-file v2.1.101/linux/net/sched/cls_fw.c linux/net/sched/cls_fw.c
@@ -38,7 +38,6 @@
 static int fw_classify(struct sk_buff *skb, struct tcf_proto *tp,
 			  struct tcf_result *res)
 {
-#if 0 /* XXX skb->fwmark, where is it? -DaveM */
 	u32 clid = skb->fwmark;
 
 	if (clid && (TC_H_MAJ(clid) == 0 ||
@@ -47,7 +46,6 @@
 		res->class = 0;
 		return 0;
 	}
-#endif
 	return -1;
 }
 
@@ -81,7 +79,7 @@
 	return handle ? -EINVAL : 0;
 }
 
-struct tcf_proto_ops fw_cls_ops = {
+struct tcf_proto_ops cls_fw_ops = {
 	NULL,
 	"fw",
 	fw_classify,

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov