Commit 8eefca48 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-2.6.26-isatap-20080403' of... 

Merge branch 'net-2.6.26-isatap-20080403' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-dev
parents 549e028d de357cc0

include/linux/if_tunnel.h

+19 −3
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ 
#define SIOCADDTUNNEL   (SIOCDEVPRIVATE + 1)

#define SIOCDELTUNNEL   (SIOCDEVPRIVATE + 2)

#define SIOCCHGTUNNEL   (SIOCDEVPRIVATE + 3)

#define SIOCGETPRL      (SIOCDEVPRIVATE + 4)

#define SIOCADDPRL      (SIOCDEVPRIVATE + 5)

#define SIOCDELPRL      (SIOCDEVPRIVATE + 6)

#define SIOCCHGPRL      (SIOCDEVPRIVATE + 7)



#define GRE_CSUM	__constant_htons(0x8000)

#define GRE_ROUTING	__constant_htons(0x4000)
@@ -17,9 +21,6 @@ 
#define GRE_FLAGS	__constant_htons(0x00F8)

#define GRE_VERSION	__constant_htons(0x0007)



/* i_flags values for SIT mode */

#define	SIT_ISATAP	0x0001



struct ip_tunnel_parm

{

	char			name[IFNAMSIZ];
@@ -31,4 +32,19 @@ struct ip_tunnel_parm 
	struct iphdr		iph;

};



/* SIT-mode i_flags */

#define	SIT_ISATAP	0x0001



struct ip_tunnel_prl {

	__be32			addr;

	__u16			flags;

	__u16			__reserved;

	__u32			datalen;

	__u32			__reserved2;

	void __user		*data;

};



/* PRL flags */

#define	PRL_DEFAULT		0x0001



#endif /* _IF_TUNNEL_H_ */

include/linux/skbuff.h

+4 −1
Original line number Diff line number Diff line
@@ -313,7 +313,10 @@ struct sk_buff { 
	__u16			tc_verd;	/* traffic control verdict */

#endif

#endif

	/* 2 byte hole */

#ifdef CONFIG_IPV6_NDISC_NODETYPE

	__u8			ndisc_nodetype:2;

#endif

	/* 14 bit hole */



#ifdef CONFIG_NET_DMA

	dma_cookie_t		dma_cookie;

include/net/addrconf.h

+4 −0
Original line number Diff line number Diff line
@@ -71,6 +71,10 @@ extern int ipv6_chk_addr(struct net *net, 
extern int			ipv6_chk_home_addr(struct net *net,

						   struct in6_addr *addr);

#endif



extern int			ipv6_chk_prefix(struct in6_addr *addr,

						struct net_device *dev);



extern struct inet6_ifaddr      *ipv6_get_ifaddr(struct net *net,

						 struct in6_addr *addr,

						 struct net_device *dev,

include/net/ipip.h

+10 −0
Original line number Diff line number Diff line
@@ -24,6 +24,16 @@ struct ip_tunnel 
	int			mlink;



	struct ip_tunnel_parm	parms;



	struct ip_tunnel_prl_entry	*prl;		/* potential router list */

	unsigned int			prl_count;	/* # of entries in PRL */

};



struct ip_tunnel_prl_entry

{

	struct ip_tunnel_prl_entry	*next;

	__be32				addr;

	u16				flags;

};



#define IPTUNNEL_XMIT() do {						\

include/net/ndisc.h

+9 −0
Original line number Diff line number Diff line
@@ -11,6 +11,15 @@ 
#define NDISC_NEIGHBOUR_ADVERTISEMENT	136

#define NDISC_REDIRECT			137



/*

 * Router type: cross-layer information from link-layer to

 * IPv6 layer reported by certain link types (e.g., RFC4214).

 */

#define NDISC_NODETYPE_UNSPEC		0	/* unspecified (default) */

#define NDISC_NODETYPE_HOST		1	/* host or unauthorized router */

#define NDISC_NODETYPE_NODEFAULT	2	/* non-default router */

#define NDISC_NODETYPE_DEFAULT		3	/* default router */



/*

 *	ndisc options

 */