Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3121a48d authored by Krzysztof Hałasa's avatar Krzysztof Hałasa Committed by David S. Miller
Browse files

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: default avatarKrzysztof Hałasa <khc@pm.waw.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d6eb633f
Loading
Loading
Loading
Loading
+4 −6
Original line number Original line Diff line number Diff line
@@ -26,8 +26,6 @@


#include <linux/if.h>
#include <linux/if.h>


#if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE)

/* Structures and constants associated with the DLCI device driver */
/* Structures and constants associated with the DLCI device driver */


struct dlci_add
struct dlci_add
@@ -127,6 +125,8 @@ struct frad_conf


#ifdef __KERNEL__
#ifdef __KERNEL__


#if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE)

/* these are the fields of an RFC 1490 header */
/* these are the fields of an RFC 1490 header */
struct frhdr
struct frhdr
{
{
@@ -190,12 +190,10 @@ struct frad_local
   int               buffer;		/* current buffer for S508 firmware */
   int               buffer;		/* current buffer for S508 firmware */
};
};


#endif /* __KERNEL__ */

#endif /* CONFIG_DLCI || CONFIG_DLCI_MODULE */
#endif /* CONFIG_DLCI || CONFIG_DLCI_MODULE */


#ifdef __KERNEL__
extern void dlci_ioctl_set(int (*hook)(unsigned int, void __user *));
extern void dlci_ioctl_set(int (*hook)(unsigned int, void __user *));
#endif

#endif /* __KERNEL__ */


#endif
#endif