git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
linux
/
if_frad.h
diff --git
a/include/linux/if_frad.h
b/include/linux/if_frad.h
index
5059003
..
f272a80
100644
(file)
--- a/
include/linux/if_frad.h
+++ b/
include/linux/if_frad.h
@@
-24,7
+24,6
@@
#ifndef _FRAD_H_
#define _FRAD_H_
#ifndef _FRAD_H_
#define _FRAD_H_
-#include <linux/config.h>
#include <linux/if.h>
#if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE)
#include <linux/if.h>
#if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE)
@@
-131,17
+130,17
@@
struct frad_conf
/* these are the fields of an RFC 1490 header */
struct frhdr
{
/* these are the fields of an RFC 1490 header */
struct frhdr
{
- unsigned char control
__attribute__((packed))
;
+ unsigned char control;
/* for IP packets, this can be the NLPID */
/* for IP packets, this can be the NLPID */
- unsigned char pad
__attribute__((packed));
+ unsigned char pad
;
- unsigned char NLPID
__attribute__((packed))
;
- unsigned char OUI[3]
__attribute__((packed))
;
- unsigned short PID
__attribute__((packed))
;
+ unsigned char NLPID;
+ unsigned char OUI[3];
+ unsigned short PID;
#define IP_NLPID pad
#define IP_NLPID pad
-};
+}
__attribute__((packed))
;
/* see RFC 1490 for the definition of the following */
#define FRAD_I_UI 0x03
/* see RFC 1490 for the definition of the following */
#define FRAD_I_UI 0x03
@@
-191,10
+190,12
@@
struct frad_local
int buffer; /* current buffer for S508 firmware */
};
int buffer; /* current buffer for S508 firmware */
};
-extern void dlci_ioctl_set(int (*hook)(unsigned int, void *));
-
#endif /* __KERNEL__ */
#endif /* CONFIG_DLCI || CONFIG_DLCI_MODULE */
#endif /* __KERNEL__ */
#endif /* CONFIG_DLCI || CONFIG_DLCI_MODULE */
+#ifdef __KERNEL__
+extern void dlci_ioctl_set(int (*hook)(unsigned int, void __user *));
+#endif
+
#endif
#endif