projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'irq-fix' of git://www.modarm9.com/gitsrc/pub/people/ukleinek/linux...
[cascardo/linux.git]
/
include
/
linux
/
if_pppox.h
diff --git
a/include/linux/if_pppox.h
b/include/linux/if_pppox.h
index
2565254
..
6fb7f17
100644
(file)
--- a/
include/linux/if_pppox.h
+++ b/
include/linux/if_pppox.h
@@
-24,7
+24,6
@@
#include <linux/if_ether.h>
#include <linux/if.h>
#include <linux/netdevice.h>
#include <linux/if_ether.h>
#include <linux/if.h>
#include <linux/netdevice.h>
-#include <asm/semaphore.h>
#include <linux/ppp_channel.h>
#endif /* __KERNEL__ */
#include <linux/if_pppol2tp.h>
#include <linux/ppp_channel.h>
#endif /* __KERNEL__ */
#include <linux/if_pppol2tp.h>
@@
-40,7
+39,7
@@
/************************************************************************
* PPPoE addressing definition
*/
/************************************************************************
* PPPoE addressing definition
*/
-typedef __
u16 sid_t;
+typedef __
be16 sid_t;
struct pppoe_addr{
sid_t sid; /* Session identifier */
unsigned char remote[ETH_ALEN]; /* Remote address */
struct pppoe_addr{
sid_t sid; /* Session identifier */
unsigned char remote[ETH_ALEN]; /* Remote address */
@@
-90,8
+89,8
@@
struct sockaddr_pppol2tp {
#define PADS_CODE 0x65
#define PADT_CODE 0xa7
struct pppoe_tag {
#define PADS_CODE 0x65
#define PADT_CODE 0xa7
struct pppoe_tag {
- __
u
16 tag_type;
- __
u
16 tag_len;
+ __
be
16 tag_type;
+ __
be
16 tag_len;
char tag_data[0];
} __attribute ((packed));
char tag_data[0];
} __attribute ((packed));
@@
-118,8
+117,8
@@
struct pppoe_hdr {
#error "Please fix <asm/byteorder.h>"
#endif
__u8 code;
#error "Please fix <asm/byteorder.h>"
#endif
__u8 code;
- __
u
16 sid;
- __
u
16 length;
+ __
be
16 sid;
+ __
be
16 length;
struct pppoe_tag tag[0];
} __attribute__ ((packed));
struct pppoe_tag tag[0];
} __attribute__ ((packed));
@@
-152,7
+151,7
@@
struct pppox_sock {
union {
struct pppoe_opt pppoe;
} proto;
union {
struct pppoe_opt pppoe;
} proto;
-
unsigned short
num;
+
__be16
num;
};
#define pppoe_dev proto.pppoe.dev
#define pppoe_ifindex proto.pppoe.ifindex
};
#define pppoe_dev proto.pppoe.dev
#define pppoe_ifindex proto.pppoe.ifindex
@@
-172,7
+171,7
@@
static inline struct sock *sk_pppox(struct pppox_sock *po)
struct module;
struct pppox_proto {
struct module;
struct pppox_proto {
- int (*create)(struct socket *sock);
+ int (*create)(struct
net *net, struct
socket *sock);
int (*ioctl)(struct socket *sock, unsigned int cmd,
unsigned long arg);
struct module *owner;
int (*ioctl)(struct socket *sock, unsigned int cmd,
unsigned long arg);
struct module *owner;