2004-06-24 15:42:36

by Paul Fulghum

[permalink] [raw]
Subject: [PATCH] 2.6.7-bk7 ppp_generic.c get_filter made conditional

Add #ifdef CONFIG_PPP_FILTER around get_filter implementation
which is only used when this option is enabled. This
prevents compiler warning (unused function) when
CONFIG_PPP_FILTER is not defined.

--
Paul Fulghum
[email protected]


--- linux-2.6.7/drivers/net/ppp_generic.c 2004-06-24 09:41:43.000000000 -0500
+++ linux-2.6.7-mg1/drivers/net/ppp_generic.c 2004-06-24 10:37:22.580842447 -0500
@@ -494,6 +494,7 @@
return mask;
}

+#ifdef CONFIG_PPP_FILTER
static int get_filter(void __user *arg, struct sock_filter **p)
{
struct sock_fprog uprog;
@@ -530,6 +531,7 @@
*p = code;
return uprog.len;
}
+#endif /* CONFIG_PPP_FILTER */

static int ppp_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)