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/gregkh/usb-2.6
[cascardo/linux.git]
/
include
/
linux
/
ipv6.h
diff --git
a/include/linux/ipv6.h
b/include/linux/ipv6.h
index
09ea01a
..
4ca60c3
100644
(file)
--- a/
include/linux/ipv6.h
+++ b/
include/linux/ipv6.h
@@
-27,8
+27,8
@@
struct in6_ifreq {
int ifr6_ifindex;
};
int ifr6_ifindex;
};
-#define IPV6_SRCRT_STRICT 0x01 /*
this hop must be a neighbor
*/
-#define IPV6_SRCRT_TYPE_0 0 /*
IPv6 type 0 Routing Header
*/
+#define IPV6_SRCRT_STRICT 0x01 /*
Deprecated; will be removed
*/
+#define IPV6_SRCRT_TYPE_0 0 /*
Deprecated; will be removed
*/
#define IPV6_SRCRT_TYPE_2 2 /* IPv6 type 2 Routing Header */
/*
#define IPV6_SRCRT_TYPE_2 2 /* IPv6 type 2 Routing Header */
/*
@@
-209,9
+209,8
@@
enum {
DEVCONF_RTR_PROBE_INTERVAL,
DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN,
DEVCONF_PROXY_NDP,
DEVCONF_RTR_PROBE_INTERVAL,
DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN,
DEVCONF_PROXY_NDP,
- __DEVCONF_OPTIMISTIC_DAD,
- DEVCONF_ACCEPT_SOURCE_ROUTE,
DEVCONF_OPTIMISTIC_DAD,
DEVCONF_OPTIMISTIC_DAD,
+ DEVCONF_ACCEPT_SOURCE_ROUTE,
DEVCONF_MAX
};
DEVCONF_MAX
};
@@
-220,7
+219,6
@@
enum {
#include <linux/tcp.h>
#include <linux/udp.h>
#include <linux/tcp.h>
#include <linux/udp.h>
-#include <net/if_inet6.h> /* struct ipv6_mc_socklist */
#include <net/inet_sock.h>
static inline struct ipv6hdr *ipv6_hdr(const struct sk_buff *skb)
#include <net/inet_sock.h>
static inline struct ipv6hdr *ipv6_hdr(const struct sk_buff *skb)
@@
-248,7
+246,7
@@
struct inet6_skb_parm {
__u16 lastopt;
__u32 nhoff;
__u16 flags;
__u16 lastopt;
__u32 nhoff;
__u16 flags;
-#if
def CONFIG_IPV6_MIP6
+#if
defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
__u16 dsthao;
#endif
__u16 dsthao;
#endif
@@
-274,6
+272,10
@@
struct tcp6_request_sock {
struct inet6_request_sock tcp6rsk_inet6;
};
struct inet6_request_sock tcp6rsk_inet6;
};
+struct ipv6_mc_socklist;
+struct ipv6_ac_socklist;
+struct ipv6_fl_socklist;
+
/**
* struct ipv6_pinfo - ipv6 private area
*
/**
* struct ipv6_pinfo - ipv6 private area
*
@@
-300,8
+302,8
@@
struct ipv6_pinfo {
/* pktoption flags */
union {
struct {
/* pktoption flags */
union {
struct {
- __u16 srcrt:
2
,
- osrcrt:
2
,
+ __u16 srcrt:
1
,
+ osrcrt:
1
,
rxinfo:1,
rxoinfo:1,
rxhlim:1,
rxinfo:1,
rxoinfo:1,
rxhlim:1,