diff options
| author | Krzysztof Hałasa <khc@pm.waw.pl> | 2009-01-26 12:30:12 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-26 12:30:12 -0800 |
| commit | 3121a48d87a580f369eeb26aa0a075142274a353 (patch) | |
| tree | d296306851b0f615fac437f77b3398ee3804be7d | |
| parent | d6eb633fe680c18119346a364acff7723245e278 (diff) | |
| download | linux-3121a48d87a580f369eeb26aa0a075142274a353.tar.gz linux-3121a48d87a580f369eeb26aa0a075142274a353.tar.bz2 linux-3121a48d87a580f369eeb26aa0a075142274a353.zip | |
net: Fix linux/if_frad.h's suitability for userspace.
The userspace interfaces are protected by CONFIG_* ifdefs
and that of course can't work.
Reported by Jaswinder Singh Rajput.
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/if_frad.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h index 5c34240de746..60e16a551dd6 100644 --- a/include/linux/if_frad.h +++ b/include/linux/if_frad.h @@ -26,8 +26,6 @@ #include <linux/if.h> -#if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE) - /* Structures and constants associated with the DLCI device driver */ struct dlci_add @@ -127,6 +125,8 @@ struct frad_conf #ifdef __KERNEL__ +#if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE) + /* these are the fields of an RFC 1490 header */ struct frhdr { @@ -190,12 +190,10 @@ struct frad_local int buffer; /* current buffer for S508 firmware */ }; -#endif /* __KERNEL__ */ - #endif /* CONFIG_DLCI || CONFIG_DLCI_MODULE */ -#ifdef __KERNEL__ extern void dlci_ioctl_set(int (*hook)(unsigned int, void __user *)); -#endif + +#endif /* __KERNEL__ */ #endif |