Skip to contentSkip to conversation

Fix missing ifdef in isdn_ppp

PATCH In review Daniele Venzano 4 participants 4 messages Jan 22, 2009 – Jan 26, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix missing ifdef in isdn_ppp

The following patch fixes a warning caused by a missing ifdef in isdn_ppp.c. A function was defined, but never used if CONFIG_IPPP_FILTER was not defined.

The warning was: ‘get_filter’ defined but not used Patch is against 2.6.28.1

drivers/isdn/i4l/isdn_ppp.c +2 -0
@@ -431,6 +431,7 @@ set_arg(void __user *b, void *val,int le
 	return 0;
 }
 
+#ifdef CONFIG_IPPP_FILTER
 static int get_filter(void __user *arg, struct sock_filter **p)
 {
 	struct sock_fprog uprog;
@@ -465,6 +466,7 @@ static int get_filter(void __user *arg, 
 	*p = code;
 	return uprog.len;
 }
+#endif /* CONFIG_IPPP_FILTER */
 
 /*
  * ippp device ioctl
Acked-by on v1 1/1
#1 lore raw

The following patch fixes a warning caused by a missing ifdef in isdn_ppp.c. A function was defined, but never used if CONFIG_IPPP_FILTER was not defined.

The warning was: ‘get_filter’ defined but not used Patch is against 2.6.28.1

drivers/isdn/i4l/isdn_ppp.c +2 -0
@@ -431,6 +431,7 @@ set_arg(void __user *b, void *val,int le
 	return 0;
 }
 
+#ifdef CONFIG_IPPP_FILTER
 static int get_filter(void __user *arg, struct sock_filter **p)
 {
 	struct sock_fprog uprog;
@@ -465,6 +466,7 @@ static int get_filter(void __user *arg, 
 	*p = code;
 	return uprog.len;
 }
+#endif /* CONFIG_IPPP_FILTER */
 
 /*
  * ippp device ioctl
Signature · 4 lines
Karsten Keil
SuSE Labs
ISDN and VOIP development
SUSE LINUX Products GmbH, Maxfeldstr.5 90409 Nuernberg, GF: Markus Rex, HRB 16746 (AG Nuernberg)
#2 lore raw

Add CC. I think this could go upstream via David Miller's net-2.6 tree.

Best,
Hannes

Quoted 29 lines · Karsten Keil

The following patch fixes a warning caused by a missing ifdef in isdn_ppp.c. A function was defined, but never used if CONFIG_IPPP_FILTER was not defined.

The warning was: 'get_filter' defined but not used Patch is against 2.6.28.1

drivers/isdn/i4l/isdn_ppp.c 2009-01-22 15:01:59.000000000 +0100 renamed from drivers/isdn/i4l/isdn_ppp.c 2009-01-22 15:01:27.000000000 +0100 +2 -0
@@ -431,6 +431,7 @@ set_arg(void __user *b, void *val,int le
       return 0;
 }
 
+#ifdef CONFIG_IPPP_FILTER
 static int get_filter(void __user *arg, struct sock_filter **p)
 {
       struct sock_fprog uprog;
@@ -465,6 +466,7 @@ static int get_filter(void __user *arg,
       *p = code;
       return uprog.len;
 }
+#endif /* CONFIG_IPPP_FILTER */
 
 /*
 * ippp device ioctl
maintainer
#3 lore raw

From: Hannes Eder <[email protected]>
Date: Fri, 23 Jan 2009 10:44:11 +0100

Quoted 1 line

Add CC. I think this could go upstream via David Miller's net-2.6 tree.

Yep, applied, thanks everyone.