projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/voyager-2.6
[cascardo/linux.git]
/
include
/
linux
/
if_pppox.h
diff --git
a/include/linux/if_pppox.h
b/include/linux/if_pppox.h
index
4fab3d0
..
6f987be
100644
(file)
--- a/
include/linux/if_pppox.h
+++ b/
include/linux/if_pppox.h
@@
-111,9
+111,20
@@
struct pppoe_hdr {
struct pppoe_tag tag[0];
} __attribute__ ((packed));
struct pppoe_tag tag[0];
} __attribute__ ((packed));
+/* Length of entire PPPoE + PPP header */
+#define PPPOE_SES_HLEN 8
+
#ifdef __KERNEL__
#ifdef __KERNEL__
+#include <linux/skbuff.h>
+
+static inline struct pppoe_hdr *pppoe_hdr(const struct sk_buff *skb)
+{
+ return (struct pppoe_hdr *)skb_network_header(skb);
+}
+
struct pppoe_opt {
struct net_device *dev; /* device associated with socket*/
struct pppoe_opt {
struct net_device *dev; /* device associated with socket*/
+ int ifindex; /* ifindex of device associated with socket */
struct pppoe_addr pa; /* what this socket is bound to*/
struct sockaddr_pppox relay; /* what socket data will be
relayed to (PPPoE relaying) */
struct pppoe_addr pa; /* what this socket is bound to*/
struct sockaddr_pppox relay; /* what socket data will be
relayed to (PPPoE relaying) */
@@
-132,6
+143,7
@@
struct pppox_sock {
unsigned short num;
};
#define pppoe_dev proto.pppoe.dev
unsigned short num;
};
#define pppoe_dev proto.pppoe.dev
+#define pppoe_ifindex proto.pppoe.ifindex
#define pppoe_pa proto.pppoe.pa
#define pppoe_relay proto.pppoe.relay
#define pppoe_pa proto.pppoe.pa
#define pppoe_relay proto.pppoe.relay