net: cleanup include/net
This cleanup patch puts struct/union/enum opening braces,
in first line to ease grep games.
struct something
{
becomes :
struct something {
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
	
	
This commit is contained in:
		
					parent
					
						
							
								4b7673a04a
							
						
					
				
			
			
				commit
				
					
						fd2c3ef761
					
				
			
		
					 37 changed files with 120 additions and 240 deletions
				
			
		| 
						 | 
					@ -8,8 +8,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct crypto_ahash;
 | 
					struct crypto_ahash;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct ah_data
 | 
					struct ah_data {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	int			icv_full_len;
 | 
						int			icv_full_len;
 | 
				
			||||||
	int			icv_trunc_len;
 | 
						int			icv_trunc_len;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -97,16 +97,14 @@ struct dn_dev {
 | 
				
			||||||
	unsigned long uptime;     /* Time device went up in jiffies */
 | 
						unsigned long uptime;     /* Time device went up in jiffies */
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct dn_short_packet
 | 
					struct dn_short_packet {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	__u8    msgflg;
 | 
						__u8    msgflg;
 | 
				
			||||||
	__le16 dstnode;
 | 
						__le16 dstnode;
 | 
				
			||||||
	__le16 srcnode;
 | 
						__le16 srcnode;
 | 
				
			||||||
	__u8   forward;
 | 
						__u8   forward;
 | 
				
			||||||
} __attribute__((packed));
 | 
					} __attribute__((packed));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct dn_long_packet
 | 
					struct dn_long_packet {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	__u8   msgflg;
 | 
						__u8   msgflg;
 | 
				
			||||||
	__u8   d_area;
 | 
						__u8   d_area;
 | 
				
			||||||
	__u8   d_subarea;
 | 
						__u8   d_subarea;
 | 
				
			||||||
| 
						 | 
					@ -122,8 +120,7 @@ struct dn_long_packet
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*------------------------- DRP - Routing messages ---------------------*/
 | 
					/*------------------------- DRP - Routing messages ---------------------*/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct endnode_hello_message
 | 
					struct endnode_hello_message {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	__u8   msgflg;
 | 
						__u8   msgflg;
 | 
				
			||||||
	__u8   tiver[3];
 | 
						__u8   tiver[3];
 | 
				
			||||||
	__u8   id[6];
 | 
						__u8   id[6];
 | 
				
			||||||
| 
						 | 
					@ -138,8 +135,7 @@ struct endnode_hello_message
 | 
				
			||||||
	__u8   data[2];
 | 
						__u8   data[2];
 | 
				
			||||||
} __attribute__((packed));
 | 
					} __attribute__((packed));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct rtnode_hello_message
 | 
					struct rtnode_hello_message {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	__u8   msgflg;
 | 
						__u8   msgflg;
 | 
				
			||||||
	__u8   tiver[3];
 | 
						__u8   tiver[3];
 | 
				
			||||||
	__u8   id[6];
 | 
						__u8   id[6];
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,8 +4,7 @@
 | 
				
			||||||
/* WARNING: The ordering of these elements must match ordering
 | 
					/* WARNING: The ordering of these elements must match ordering
 | 
				
			||||||
 *          of RTA_* rtnetlink attribute numbers.
 | 
					 *          of RTA_* rtnetlink attribute numbers.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
struct dn_kern_rta
 | 
					struct dn_kern_rta {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
        void            *rta_dst;
 | 
					        void            *rta_dst;
 | 
				
			||||||
        void            *rta_src;
 | 
					        void            *rta_src;
 | 
				
			||||||
        int             *rta_iif;
 | 
					        int             *rta_iif;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -70,30 +70,26 @@ extern struct sk_buff *dn_alloc_send_skb(struct sock *sk, size_t *size, int nobl
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Data Messages    (data segment/interrupt/link service)               */
 | 
					/* Data Messages    (data segment/interrupt/link service)               */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct nsp_data_seg_msg
 | 
					struct nsp_data_seg_msg {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	__u8   msgflg;
 | 
						__u8   msgflg;
 | 
				
			||||||
	__le16 dstaddr;
 | 
						__le16 dstaddr;
 | 
				
			||||||
	__le16 srcaddr;
 | 
						__le16 srcaddr;
 | 
				
			||||||
} __attribute__((packed));
 | 
					} __attribute__((packed));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct nsp_data_opt_msg
 | 
					struct nsp_data_opt_msg {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	__le16 acknum;
 | 
						__le16 acknum;
 | 
				
			||||||
	__le16 segnum;
 | 
						__le16 segnum;
 | 
				
			||||||
	__le16 lsflgs;
 | 
						__le16 lsflgs;
 | 
				
			||||||
} __attribute__((packed));
 | 
					} __attribute__((packed));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct nsp_data_opt_msg1
 | 
					struct nsp_data_opt_msg1 {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	__le16 acknum;
 | 
						__le16 acknum;
 | 
				
			||||||
	__le16 segnum;
 | 
						__le16 segnum;
 | 
				
			||||||
} __attribute__((packed));
 | 
					} __attribute__((packed));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Acknowledgment Message (data/other data)                             */
 | 
					/* Acknowledgment Message (data/other data)                             */
 | 
				
			||||||
struct nsp_data_ack_msg
 | 
					struct nsp_data_ack_msg {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	__u8   msgflg;
 | 
						__u8   msgflg;
 | 
				
			||||||
	__le16 dstaddr;
 | 
						__le16 dstaddr;
 | 
				
			||||||
	__le16 srcaddr;
 | 
						__le16 srcaddr;
 | 
				
			||||||
| 
						 | 
					@ -101,16 +97,14 @@ struct nsp_data_ack_msg
 | 
				
			||||||
} __attribute__((packed));
 | 
					} __attribute__((packed));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Connect Acknowledgment Message */
 | 
					/* Connect Acknowledgment Message */
 | 
				
			||||||
struct  nsp_conn_ack_msg
 | 
					struct  nsp_conn_ack_msg {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	__u8 msgflg;
 | 
						__u8 msgflg;
 | 
				
			||||||
	__le16 dstaddr;
 | 
						__le16 dstaddr;
 | 
				
			||||||
} __attribute__((packed));
 | 
					} __attribute__((packed));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Connect Initiate/Retransmit Initiate/Connect Confirm */
 | 
					/* Connect Initiate/Retransmit Initiate/Connect Confirm */
 | 
				
			||||||
struct  nsp_conn_init_msg
 | 
					struct  nsp_conn_init_msg {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	__u8   msgflg;
 | 
						__u8   msgflg;
 | 
				
			||||||
#define NSP_CI      0x18            /* Connect Initiate     */
 | 
					#define NSP_CI      0x18            /* Connect Initiate     */
 | 
				
			||||||
#define NSP_RCI     0x68            /* Retrans. Conn Init   */
 | 
					#define NSP_RCI     0x68            /* Retrans. Conn Init   */
 | 
				
			||||||
| 
						 | 
					@ -126,8 +120,7 @@ struct  nsp_conn_init_msg
 | 
				
			||||||
} __attribute__((packed));
 | 
					} __attribute__((packed));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Disconnect Initiate/Disconnect Confirm */
 | 
					/* Disconnect Initiate/Disconnect Confirm */
 | 
				
			||||||
struct  nsp_disconn_init_msg
 | 
					struct  nsp_disconn_init_msg {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	__u8   msgflg;
 | 
						__u8   msgflg;
 | 
				
			||||||
	__le16 dstaddr;
 | 
						__le16 dstaddr;
 | 
				
			||||||
	__le16 srcaddr;
 | 
						__le16 srcaddr;
 | 
				
			||||||
| 
						 | 
					@ -136,8 +129,7 @@ struct  nsp_disconn_init_msg
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct  srcobj_fmt
 | 
					struct  srcobj_fmt {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	__u8   format;
 | 
						__u8   format;
 | 
				
			||||||
	__u8   task;
 | 
						__u8   task;
 | 
				
			||||||
	__le16 grpcode;
 | 
						__le16 grpcode;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -36,8 +36,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct sk_buff;
 | 
					struct sk_buff;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct dst_entry
 | 
					struct dst_entry {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct rcu_head		rcu_head;
 | 
						struct rcu_head		rcu_head;
 | 
				
			||||||
	struct dst_entry	*child;
 | 
						struct dst_entry	*child;
 | 
				
			||||||
	struct net_device       *dev;
 | 
						struct net_device       *dev;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,8 +7,7 @@
 | 
				
			||||||
#include <net/flow.h>
 | 
					#include <net/flow.h>
 | 
				
			||||||
#include <net/rtnetlink.h>
 | 
					#include <net/rtnetlink.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct fib_rule
 | 
					struct fib_rule {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct list_head	list;
 | 
						struct list_head	list;
 | 
				
			||||||
	atomic_t		refcnt;
 | 
						atomic_t		refcnt;
 | 
				
			||||||
	int			ifindex;
 | 
						int			ifindex;
 | 
				
			||||||
| 
						 | 
					@ -25,15 +24,13 @@ struct fib_rule
 | 
				
			||||||
	struct net *		fr_net;
 | 
						struct net *		fr_net;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct fib_lookup_arg
 | 
					struct fib_lookup_arg {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	void			*lookup_ptr;
 | 
						void			*lookup_ptr;
 | 
				
			||||||
	void			*result;
 | 
						void			*result;
 | 
				
			||||||
	struct fib_rule		*rule;
 | 
						struct fib_rule		*rule;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct fib_rules_ops
 | 
					struct fib_rules_ops {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	int			family;
 | 
						int			family;
 | 
				
			||||||
	struct list_head	list;
 | 
						struct list_head	list;
 | 
				
			||||||
	int			rule_size;
 | 
						int			rule_size;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,8 +6,7 @@
 | 
				
			||||||
#include <linux/rtnetlink.h>
 | 
					#include <linux/rtnetlink.h>
 | 
				
			||||||
#include <linux/pkt_sched.h>
 | 
					#include <linux/pkt_sched.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct gnet_dump
 | 
					struct gnet_dump {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	spinlock_t *      lock;
 | 
						spinlock_t *      lock;
 | 
				
			||||||
	struct sk_buff *  skb;
 | 
						struct sk_buff *  skb;
 | 
				
			||||||
	struct nlattr *   tail;
 | 
						struct nlattr *   tail;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,8 +13,7 @@
 | 
				
			||||||
 * @list: list entry for linking
 | 
					 * @list: list entry for linking
 | 
				
			||||||
 * @family: pointer to family, need not be set before registering
 | 
					 * @family: pointer to family, need not be set before registering
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
struct genl_multicast_group
 | 
					struct genl_multicast_group {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct genl_family	*family;	/* private */
 | 
						struct genl_family	*family;	/* private */
 | 
				
			||||||
	struct list_head	list;		/* private */
 | 
						struct list_head	list;		/* private */
 | 
				
			||||||
	char			name[GENL_NAMSIZ];
 | 
						char			name[GENL_NAMSIZ];
 | 
				
			||||||
| 
						 | 
					@ -35,8 +34,7 @@ struct genl_multicast_group
 | 
				
			||||||
 * @family_list: family list
 | 
					 * @family_list: family list
 | 
				
			||||||
 * @mcast_groups: multicast groups list
 | 
					 * @mcast_groups: multicast groups list
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
struct genl_family
 | 
					struct genl_family {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	unsigned int		id;
 | 
						unsigned int		id;
 | 
				
			||||||
	unsigned int		hdrsize;
 | 
						unsigned int		hdrsize;
 | 
				
			||||||
	char			name[GENL_NAMSIZ];
 | 
						char			name[GENL_NAMSIZ];
 | 
				
			||||||
| 
						 | 
					@ -58,8 +56,7 @@ struct genl_family
 | 
				
			||||||
 * @userhdr: user specific header
 | 
					 * @userhdr: user specific header
 | 
				
			||||||
 * @attrs: netlink attributes
 | 
					 * @attrs: netlink attributes
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
struct genl_info
 | 
					struct genl_info {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	u32			snd_seq;
 | 
						u32			snd_seq;
 | 
				
			||||||
	u32			snd_pid;
 | 
						u32			snd_pid;
 | 
				
			||||||
	struct nlmsghdr *	nlhdr;
 | 
						struct nlmsghdr *	nlhdr;
 | 
				
			||||||
| 
						 | 
					@ -102,8 +99,7 @@ static inline void genl_info_net_set(struct genl_info *info, struct net *net)
 | 
				
			||||||
 * @done: completion callback for dumps
 | 
					 * @done: completion callback for dumps
 | 
				
			||||||
 * @ops_list: operations list
 | 
					 * @ops_list: operations list
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
struct genl_ops
 | 
					struct genl_ops {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	u8			cmd;
 | 
						u8			cmd;
 | 
				
			||||||
	unsigned int		flags;
 | 
						unsigned int		flags;
 | 
				
			||||||
	const struct nla_policy	*policy;
 | 
						const struct nla_policy	*policy;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -32,8 +32,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef __KERNEL__
 | 
					#ifdef __KERNEL__
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct inet6_ifaddr 
 | 
					struct inet6_ifaddr {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct in6_addr		addr;
 | 
						struct in6_addr		addr;
 | 
				
			||||||
	__u32			prefix_len;
 | 
						__u32			prefix_len;
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
| 
						 | 
					@ -67,8 +66,7 @@ struct inet6_ifaddr
 | 
				
			||||||
	int			dead;
 | 
						int			dead;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct ip6_sf_socklist
 | 
					struct ip6_sf_socklist {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	unsigned int		sl_max;
 | 
						unsigned int		sl_max;
 | 
				
			||||||
	unsigned int		sl_count;
 | 
						unsigned int		sl_count;
 | 
				
			||||||
	struct in6_addr		sl_addr[0];
 | 
						struct in6_addr		sl_addr[0];
 | 
				
			||||||
| 
						 | 
					@ -79,8 +77,7 @@ struct ip6_sf_socklist
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define IP6_SFBLOCK	10	/* allocate this many at once */
 | 
					#define IP6_SFBLOCK	10	/* allocate this many at once */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct ipv6_mc_socklist
 | 
					struct ipv6_mc_socklist {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct in6_addr		addr;
 | 
						struct in6_addr		addr;
 | 
				
			||||||
	int			ifindex;
 | 
						int			ifindex;
 | 
				
			||||||
	struct ipv6_mc_socklist *next;
 | 
						struct ipv6_mc_socklist *next;
 | 
				
			||||||
| 
						 | 
					@ -89,8 +86,7 @@ struct ipv6_mc_socklist
 | 
				
			||||||
	struct ip6_sf_socklist	*sflist;
 | 
						struct ip6_sf_socklist	*sflist;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct ip6_sf_list
 | 
					struct ip6_sf_list {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct ip6_sf_list	*sf_next;
 | 
						struct ip6_sf_list	*sf_next;
 | 
				
			||||||
	struct in6_addr		sf_addr;
 | 
						struct in6_addr		sf_addr;
 | 
				
			||||||
	unsigned long		sf_count[2];	/* include/exclude counts */
 | 
						unsigned long		sf_count[2];	/* include/exclude counts */
 | 
				
			||||||
| 
						 | 
					@ -105,8 +101,7 @@ struct ip6_sf_list
 | 
				
			||||||
#define MAF_NOREPORT		0x08
 | 
					#define MAF_NOREPORT		0x08
 | 
				
			||||||
#define MAF_GSQUERY		0x10
 | 
					#define MAF_GSQUERY		0x10
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct ifmcaddr6
 | 
					struct ifmcaddr6 {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct in6_addr		mca_addr;
 | 
						struct in6_addr		mca_addr;
 | 
				
			||||||
	struct inet6_dev	*idev;
 | 
						struct inet6_dev	*idev;
 | 
				
			||||||
	struct ifmcaddr6	*next;
 | 
						struct ifmcaddr6	*next;
 | 
				
			||||||
| 
						 | 
					@ -126,15 +121,13 @@ struct ifmcaddr6
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Anycast stuff */
 | 
					/* Anycast stuff */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct ipv6_ac_socklist
 | 
					struct ipv6_ac_socklist {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct in6_addr		acl_addr;
 | 
						struct in6_addr		acl_addr;
 | 
				
			||||||
	int			acl_ifindex;
 | 
						int			acl_ifindex;
 | 
				
			||||||
	struct ipv6_ac_socklist *acl_next;
 | 
						struct ipv6_ac_socklist *acl_next;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct ifacaddr6
 | 
					struct ifacaddr6 {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct in6_addr		aca_addr;
 | 
						struct in6_addr		aca_addr;
 | 
				
			||||||
	struct inet6_dev	*aca_idev;
 | 
						struct inet6_dev	*aca_idev;
 | 
				
			||||||
	struct rt6_info		*aca_rt;
 | 
						struct rt6_info		*aca_rt;
 | 
				
			||||||
| 
						 | 
					@ -157,8 +150,7 @@ struct ipv6_devstat {
 | 
				
			||||||
	DEFINE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg);
 | 
						DEFINE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct inet6_dev 
 | 
					struct inet6_dev {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct net_device		*dev;
 | 
						struct net_device		*dev;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	struct inet6_ifaddr	*addr_list;
 | 
						struct inet6_ifaddr	*addr_list;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,8 +13,7 @@
 | 
				
			||||||
#include <linux/spinlock.h>
 | 
					#include <linux/spinlock.h>
 | 
				
			||||||
#include <asm/atomic.h>
 | 
					#include <asm/atomic.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct inet_peer
 | 
					struct inet_peer {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	/* group together avl_left,avl_right,v4daddr to speedup lookups */
 | 
						/* group together avl_left,avl_right,v4daddr to speedup lookups */
 | 
				
			||||||
	struct inet_peer	*avl_left, *avl_right;
 | 
						struct inet_peer	*avl_left, *avl_right;
 | 
				
			||||||
	__be32			v4daddr;	/* peer's address */
 | 
						__be32			v4daddr;	/* peer's address */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -33,8 +33,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct sock;
 | 
					struct sock;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct inet_skb_parm
 | 
					struct inet_skb_parm {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct ip_options	opt;		/* Compiled IP options		*/
 | 
						struct ip_options	opt;		/* Compiled IP options		*/
 | 
				
			||||||
	unsigned char		flags;
 | 
						unsigned char		flags;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -50,8 +49,7 @@ static inline unsigned int ip_hdrlen(const struct sk_buff *skb)
 | 
				
			||||||
	return ip_hdr(skb)->ihl * 4;
 | 
						return ip_hdr(skb)->ihl * 4;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct ipcm_cookie
 | 
					struct ipcm_cookie {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	__be32			addr;
 | 
						__be32			addr;
 | 
				
			||||||
	int			oif;
 | 
						int			oif;
 | 
				
			||||||
	struct ip_options	*opt;
 | 
						struct ip_options	*opt;
 | 
				
			||||||
| 
						 | 
					@ -60,8 +58,7 @@ struct ipcm_cookie
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define IPCB(skb) ((struct inet_skb_parm*)((skb)->cb))
 | 
					#define IPCB(skb) ((struct inet_skb_parm*)((skb)->cb))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct ip_ra_chain
 | 
					struct ip_ra_chain {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct ip_ra_chain	*next;
 | 
						struct ip_ra_chain	*next;
 | 
				
			||||||
	struct sock		*sk;
 | 
						struct sock		*sk;
 | 
				
			||||||
	void			(*destructor)(struct sock *);
 | 
						void			(*destructor)(struct sock *);
 | 
				
			||||||
| 
						 | 
					@ -159,8 +156,7 @@ static inline __u8 ip_reply_arg_flowi_flags(const struct ip_reply_arg *arg)
 | 
				
			||||||
void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *arg,
 | 
					void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *arg,
 | 
				
			||||||
		   unsigned int len); 
 | 
							   unsigned int len); 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct ipv4_config
 | 
					struct ipv4_config {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	int	log_martians;
 | 
						int	log_martians;
 | 
				
			||||||
	int	no_pmtu_disc;
 | 
						int	no_pmtu_disc;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
| 
						 | 
					@ -336,8 +332,7 @@ extern int	ip_call_ra_chain(struct sk_buff *skb);
 | 
				
			||||||
 *	Functions provided by ip_fragment.c
 | 
					 *	Functions provided by ip_fragment.c
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
enum ip_defrag_users
 | 
					enum ip_defrag_users {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	IP_DEFRAG_LOCAL_DELIVER,
 | 
						IP_DEFRAG_LOCAL_DELIVER,
 | 
				
			||||||
	IP_DEFRAG_CALL_RA_CHAIN,
 | 
						IP_DEFRAG_CALL_RA_CHAIN,
 | 
				
			||||||
	IP_DEFRAG_CONNTRACK_IN,
 | 
						IP_DEFRAG_CONNTRACK_IN,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -30,8 +30,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct rt6_info;
 | 
					struct rt6_info;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct fib6_config
 | 
					struct fib6_config {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	u32		fc_table;
 | 
						u32		fc_table;
 | 
				
			||||||
	u32		fc_metric;
 | 
						u32		fc_metric;
 | 
				
			||||||
	int		fc_dst_len;
 | 
						int		fc_dst_len;
 | 
				
			||||||
| 
						 | 
					@ -51,8 +50,7 @@ struct fib6_config
 | 
				
			||||||
	struct nl_info	fc_nlinfo;
 | 
						struct nl_info	fc_nlinfo;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct fib6_node
 | 
					struct fib6_node {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct fib6_node	*parent;
 | 
						struct fib6_node	*parent;
 | 
				
			||||||
	struct fib6_node	*left;
 | 
						struct fib6_node	*left;
 | 
				
			||||||
	struct fib6_node	*right;
 | 
						struct fib6_node	*right;
 | 
				
			||||||
| 
						 | 
					@ -78,16 +76,14 @@ struct fib6_node
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct rt6key
 | 
					struct rt6key {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct in6_addr	addr;
 | 
						struct in6_addr	addr;
 | 
				
			||||||
	int		plen;
 | 
						int		plen;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct fib6_table;
 | 
					struct fib6_table;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct rt6_info
 | 
					struct rt6_info {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	union {
 | 
						union {
 | 
				
			||||||
		struct dst_entry	dst;
 | 
							struct dst_entry	dst;
 | 
				
			||||||
	} u;
 | 
						} u;
 | 
				
			||||||
| 
						 | 
					@ -127,8 +123,7 @@ static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst)
 | 
				
			||||||
	return ((struct rt6_info *)dst)->rt6i_idev;
 | 
						return ((struct rt6_info *)dst)->rt6i_idev;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct fib6_walker_t
 | 
					struct fib6_walker_t {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct fib6_walker_t *prev, *next;
 | 
						struct fib6_walker_t *prev, *next;
 | 
				
			||||||
	struct fib6_node *root, *node;
 | 
						struct fib6_node *root, *node;
 | 
				
			||||||
	struct rt6_info *leaf;
 | 
						struct rt6_info *leaf;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -103,8 +103,7 @@ extern void			rt6_pmtu_discovery(struct in6_addr *daddr,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct netlink_callback;
 | 
					struct netlink_callback;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct rt6_rtnl_dump_arg
 | 
					struct rt6_rtnl_dump_arg {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct sk_buff *skb;
 | 
						struct sk_buff *skb;
 | 
				
			||||||
	struct netlink_callback *cb;
 | 
						struct netlink_callback *cb;
 | 
				
			||||||
	struct net *net;
 | 
						struct net *net;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -251,8 +251,7 @@ struct ip_vs_estimator {
 | 
				
			||||||
	u32			outbps;
 | 
						u32			outbps;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct ip_vs_stats
 | 
					struct ip_vs_stats {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct ip_vs_stats_user	ustats;         /* statistics */
 | 
						struct ip_vs_stats_user	ustats;         /* statistics */
 | 
				
			||||||
	struct ip_vs_estimator	est;		/* estimator */
 | 
						struct ip_vs_estimator	est;		/* estimator */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -518,8 +517,7 @@ struct ip_vs_scheduler {
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 *	The application module object (a.k.a. app incarnation)
 | 
					 *	The application module object (a.k.a. app incarnation)
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
struct ip_vs_app
 | 
					struct ip_vs_app {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct list_head	a_list;		/* member in app list */
 | 
						struct list_head	a_list;		/* member in app list */
 | 
				
			||||||
	int			type;		/* IP_VS_APP_TYPE_xxx */
 | 
						int			type;		/* IP_VS_APP_TYPE_xxx */
 | 
				
			||||||
	char			*name;		/* application module name */
 | 
						char			*name;		/* application module name */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8,16 +8,14 @@
 | 
				
			||||||
#define IPTUNNEL_ERR_TIMEO	(30*HZ)
 | 
					#define IPTUNNEL_ERR_TIMEO	(30*HZ)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* 6rd prefix/relay information */
 | 
					/* 6rd prefix/relay information */
 | 
				
			||||||
struct ip_tunnel_6rd_parm
 | 
					struct ip_tunnel_6rd_parm {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct in6_addr		prefix;
 | 
						struct in6_addr		prefix;
 | 
				
			||||||
	__be32			relay_prefix;
 | 
						__be32			relay_prefix;
 | 
				
			||||||
	u16			prefixlen;
 | 
						u16			prefixlen;
 | 
				
			||||||
	u16			relay_prefixlen;
 | 
						u16			relay_prefixlen;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct ip_tunnel
 | 
					struct ip_tunnel {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct ip_tunnel	*next;
 | 
						struct ip_tunnel	*next;
 | 
				
			||||||
	struct net_device	*dev;
 | 
						struct net_device	*dev;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -40,8 +38,7 @@ struct ip_tunnel
 | 
				
			||||||
	unsigned int			prl_count;	/* # of entries in PRL */
 | 
						unsigned int			prl_count;	/* # of entries in PRL */
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct ip_tunnel_prl_entry
 | 
					struct ip_tunnel_prl_entry {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct ip_tunnel_prl_entry	*next;
 | 
						struct ip_tunnel_prl_entry	*next;
 | 
				
			||||||
	__be32				addr;
 | 
						__be32				addr;
 | 
				
			||||||
	u16				flags;
 | 
						u16				flags;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -160,8 +160,7 @@ extern struct ctl_path net_ipv6_ctl_path[];
 | 
				
			||||||
#define ICMP6MSGIN_INC_STATS_BH(net, idev, field)	\
 | 
					#define ICMP6MSGIN_INC_STATS_BH(net, idev, field)	\
 | 
				
			||||||
	_DEVINC(net, icmpv6msg, _BH, idev, field)
 | 
						_DEVINC(net, icmpv6msg, _BH, idev, field)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct ip6_ra_chain
 | 
					struct ip6_ra_chain {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct ip6_ra_chain	*next;
 | 
						struct ip6_ra_chain	*next;
 | 
				
			||||||
	struct sock		*sk;
 | 
						struct sock		*sk;
 | 
				
			||||||
	int			sel;
 | 
						int			sel;
 | 
				
			||||||
| 
						 | 
					@ -176,8 +175,7 @@ extern rwlock_t ip6_ra_lock;
 | 
				
			||||||
   ancillary data and passed to IPv6.
 | 
					   ancillary data and passed to IPv6.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct ipv6_txoptions
 | 
					struct ipv6_txoptions {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	/* Length of this structure */
 | 
						/* Length of this structure */
 | 
				
			||||||
	int			tot_len;
 | 
						int			tot_len;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -194,8 +192,7 @@ struct ipv6_txoptions
 | 
				
			||||||
	/* Option buffer, as read by IPV6_PKTOPTIONS, starts here. */
 | 
						/* Option buffer, as read by IPV6_PKTOPTIONS, starts here. */
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct ip6_flowlabel
 | 
					struct ip6_flowlabel {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct ip6_flowlabel	*next;
 | 
						struct ip6_flowlabel	*next;
 | 
				
			||||||
	__be32			label;
 | 
						__be32			label;
 | 
				
			||||||
	atomic_t		users;
 | 
						atomic_t		users;
 | 
				
			||||||
| 
						 | 
					@ -212,8 +209,7 @@ struct ip6_flowlabel
 | 
				
			||||||
#define IPV6_FLOWINFO_MASK	cpu_to_be32(0x0FFFFFFF)
 | 
					#define IPV6_FLOWINFO_MASK	cpu_to_be32(0x0FFFFFFF)
 | 
				
			||||||
#define IPV6_FLOWLABEL_MASK	cpu_to_be32(0x000FFFFF)
 | 
					#define IPV6_FLOWLABEL_MASK	cpu_to_be32(0x000FFFFF)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct ipv6_fl_socklist
 | 
					struct ipv6_fl_socklist {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct ipv6_fl_socklist	*next;
 | 
						struct ipv6_fl_socklist	*next;
 | 
				
			||||||
	struct ip6_flowlabel	*fl;
 | 
						struct ip6_flowlabel	*fl;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -300,8 +300,7 @@
 | 
				
			||||||
 * This struct is also my long term insurance. I can add new fields here
 | 
					 * This struct is also my long term insurance. I can add new fields here
 | 
				
			||||||
 * without breaking the prototype of iw_handler...
 | 
					 * without breaking the prototype of iw_handler...
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
struct iw_request_info
 | 
					struct iw_request_info {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	__u16		cmd;		/* Wireless Extension command */
 | 
						__u16		cmd;		/* Wireless Extension command */
 | 
				
			||||||
	__u16		flags;		/* More to come ;-) */
 | 
						__u16		flags;		/* More to come ;-) */
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
| 
						 | 
					@ -321,8 +320,7 @@ typedef int (*iw_handler)(struct net_device *dev, struct iw_request_info *info,
 | 
				
			||||||
 * shared by all driver instances... Same for the members...
 | 
					 * shared by all driver instances... Same for the members...
 | 
				
			||||||
 * This will be linked from net_device in <linux/netdevice.h>
 | 
					 * This will be linked from net_device in <linux/netdevice.h>
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
struct iw_handler_def
 | 
					struct iw_handler_def {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* Array of handlers for standard ioctls
 | 
						/* Array of handlers for standard ioctls
 | 
				
			||||||
	 * We will call dev->wireless_handlers->standard[ioctl - SIOCSIWCOMMIT]
 | 
						 * We will call dev->wireless_handlers->standard[ioctl - SIOCSIWCOMMIT]
 | 
				
			||||||
| 
						 | 
					@ -372,8 +370,7 @@ struct iw_handler_def
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Describe how a standard IOCTL looks like.
 | 
					 * Describe how a standard IOCTL looks like.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
struct iw_ioctl_description
 | 
					struct iw_ioctl_description {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	__u8	header_type;		/* NULL, iw_point or other */
 | 
						__u8	header_type;		/* NULL, iw_point or other */
 | 
				
			||||||
	__u8	token_type;		/* Future */
 | 
						__u8	token_type;		/* Future */
 | 
				
			||||||
	__u16	token_size;		/* Granularity of payload */
 | 
						__u16	token_size;		/* Granularity of payload */
 | 
				
			||||||
| 
						 | 
					@ -395,8 +392,7 @@ struct iw_ioctl_description
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Instance specific spy data, i.e. addresses spied and quality for them.
 | 
					 * Instance specific spy data, i.e. addresses spied and quality for them.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
struct iw_spy_data
 | 
					struct iw_spy_data {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	/* --- Standard spy support --- */
 | 
						/* --- Standard spy support --- */
 | 
				
			||||||
	int			spy_number;
 | 
						int			spy_number;
 | 
				
			||||||
	u_char			spy_address[IW_MAX_SPY][ETH_ALEN];
 | 
						u_char			spy_address[IW_MAX_SPY][ETH_ALEN];
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -37,8 +37,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct neighbour;
 | 
					struct neighbour;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct neigh_parms
 | 
					struct neigh_parms {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
#ifdef CONFIG_NET_NS
 | 
					#ifdef CONFIG_NET_NS
 | 
				
			||||||
	struct net *net;
 | 
						struct net *net;
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
| 
						 | 
					@ -70,8 +69,7 @@ struct neigh_parms
 | 
				
			||||||
	int	locktime;
 | 
						int	locktime;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct neigh_statistics
 | 
					struct neigh_statistics {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	unsigned long allocs;		/* number of allocated neighs */
 | 
						unsigned long allocs;		/* number of allocated neighs */
 | 
				
			||||||
	unsigned long destroys;		/* number of destroyed neighs */
 | 
						unsigned long destroys;		/* number of destroyed neighs */
 | 
				
			||||||
	unsigned long hash_grows;	/* number of hash resizes */
 | 
						unsigned long hash_grows;	/* number of hash resizes */
 | 
				
			||||||
| 
						 | 
					@ -97,8 +95,7 @@ struct neigh_statistics
 | 
				
			||||||
		preempt_enable();					\
 | 
							preempt_enable();					\
 | 
				
			||||||
	} while (0)
 | 
						} while (0)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct neighbour
 | 
					struct neighbour {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct neighbour	*next;
 | 
						struct neighbour	*next;
 | 
				
			||||||
	struct neigh_table	*tbl;
 | 
						struct neigh_table	*tbl;
 | 
				
			||||||
	struct neigh_parms	*parms;
 | 
						struct neigh_parms	*parms;
 | 
				
			||||||
| 
						 | 
					@ -122,8 +119,7 @@ struct neighbour
 | 
				
			||||||
	u8			primary_key[0];
 | 
						u8			primary_key[0];
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct neigh_ops
 | 
					struct neigh_ops {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	int			family;
 | 
						int			family;
 | 
				
			||||||
	void			(*solicit)(struct neighbour *, struct sk_buff*);
 | 
						void			(*solicit)(struct neighbour *, struct sk_buff*);
 | 
				
			||||||
	void			(*error_report)(struct neighbour *, struct sk_buff*);
 | 
						void			(*error_report)(struct neighbour *, struct sk_buff*);
 | 
				
			||||||
| 
						 | 
					@ -133,8 +129,7 @@ struct neigh_ops
 | 
				
			||||||
	int			(*queue_xmit)(struct sk_buff*);
 | 
						int			(*queue_xmit)(struct sk_buff*);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct pneigh_entry
 | 
					struct pneigh_entry {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct pneigh_entry	*next;
 | 
						struct pneigh_entry	*next;
 | 
				
			||||||
#ifdef CONFIG_NET_NS
 | 
					#ifdef CONFIG_NET_NS
 | 
				
			||||||
	struct net		*net;
 | 
						struct net		*net;
 | 
				
			||||||
| 
						 | 
					@ -149,8 +144,7 @@ struct pneigh_entry
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct neigh_table
 | 
					struct neigh_table {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct neigh_table	*next;
 | 
						struct neigh_table	*next;
 | 
				
			||||||
	int			family;
 | 
						int			family;
 | 
				
			||||||
	int			entry_size;
 | 
						int			entry_size;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,8 +13,7 @@
 | 
				
			||||||
#include <net/netfilter/nf_conntrack_extend.h>
 | 
					#include <net/netfilter/nf_conntrack_extend.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Connection tracking event types */
 | 
					/* Connection tracking event types */
 | 
				
			||||||
enum ip_conntrack_events
 | 
					enum ip_conntrack_events {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	IPCT_NEW		= 0,	/* new conntrack */
 | 
						IPCT_NEW		= 0,	/* new conntrack */
 | 
				
			||||||
	IPCT_RELATED		= 1,	/* related conntrack */
 | 
						IPCT_RELATED		= 1,	/* related conntrack */
 | 
				
			||||||
	IPCT_DESTROY		= 2,	/* destroyed conntrack */
 | 
						IPCT_DESTROY		= 2,	/* destroyed conntrack */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -9,8 +9,7 @@
 | 
				
			||||||
extern unsigned int nf_ct_expect_hsize;
 | 
					extern unsigned int nf_ct_expect_hsize;
 | 
				
			||||||
extern unsigned int nf_ct_expect_max;
 | 
					extern unsigned int nf_ct_expect_max;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct nf_conntrack_expect
 | 
					struct nf_conntrack_expect {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	/* Conntrack expectation list member */
 | 
						/* Conntrack expectation list member */
 | 
				
			||||||
	struct hlist_node lnode;
 | 
						struct hlist_node lnode;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -64,8 +63,7 @@ static inline struct net *nf_ct_exp_net(struct nf_conntrack_expect *exp)
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct nf_conntrack_expect_policy
 | 
					struct nf_conntrack_expect_policy {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	unsigned int	max_expected;
 | 
						unsigned int	max_expected;
 | 
				
			||||||
	unsigned int	timeout;
 | 
						unsigned int	timeout;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,8 +3,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <net/netfilter/nf_conntrack.h>
 | 
					#include <net/netfilter/nf_conntrack.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
enum nf_ct_ext_id
 | 
					enum nf_ct_ext_id {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	NF_CT_EXT_HELPER,
 | 
						NF_CT_EXT_HELPER,
 | 
				
			||||||
	NF_CT_EXT_NAT,
 | 
						NF_CT_EXT_NAT,
 | 
				
			||||||
	NF_CT_EXT_ACCT,
 | 
						NF_CT_EXT_ACCT,
 | 
				
			||||||
| 
						 | 
					@ -65,8 +64,7 @@ __nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define NF_CT_EXT_F_PREALLOC	0x0001
 | 
					#define NF_CT_EXT_F_PREALLOC	0x0001
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct nf_ct_ext_type
 | 
					struct nf_ct_ext_type {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	/* Destroys relationships (can be NULL). */
 | 
						/* Destroys relationships (can be NULL). */
 | 
				
			||||||
	void (*destroy)(struct nf_conn *ct);
 | 
						void (*destroy)(struct nf_conn *ct);
 | 
				
			||||||
	/* Called when realloacted (can be NULL).
 | 
						/* Called when realloacted (can be NULL).
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -16,8 +16,7 @@ struct module;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define NF_CT_HELPER_NAME_LEN	16
 | 
					#define NF_CT_HELPER_NAME_LEN	16
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct nf_conntrack_helper
 | 
					struct nf_conntrack_helper {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct hlist_node hnode;	/* Internal use. */
 | 
						struct hlist_node hnode;	/* Internal use. */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	const char *name;		/* name of the module */
 | 
						const char *name;		/* name of the module */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -16,8 +16,7 @@
 | 
				
			||||||
#include <linux/seq_file.h>
 | 
					#include <linux/seq_file.h>
 | 
				
			||||||
#include <net/netfilter/nf_conntrack.h>
 | 
					#include <net/netfilter/nf_conntrack.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct nf_conntrack_l3proto
 | 
					struct nf_conntrack_l3proto {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	/* L3 Protocol Family number. ex) PF_INET */
 | 
						/* L3 Protocol Family number. ex) PF_INET */
 | 
				
			||||||
	u_int16_t l3proto;
 | 
						u_int16_t l3proto;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -15,8 +15,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct seq_file;
 | 
					struct seq_file;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct nf_conntrack_l4proto
 | 
					struct nf_conntrack_l4proto {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	/* L3 Protocol number. */
 | 
						/* L3 Protocol number. */
 | 
				
			||||||
	u_int16_t l3proto;
 | 
						u_int16_t l3proto;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -26,8 +26,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* The protocol-specific manipulable parts of the tuple: always in
 | 
					/* The protocol-specific manipulable parts of the tuple: always in
 | 
				
			||||||
   network order! */
 | 
					   network order! */
 | 
				
			||||||
union nf_conntrack_man_proto
 | 
					union nf_conntrack_man_proto {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	/* Add other protocols here. */
 | 
						/* Add other protocols here. */
 | 
				
			||||||
	__be16 all;
 | 
						__be16 all;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -52,8 +51,7 @@ union nf_conntrack_man_proto
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* The manipulable part of the tuple. */
 | 
					/* The manipulable part of the tuple. */
 | 
				
			||||||
struct nf_conntrack_man
 | 
					struct nf_conntrack_man {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	union nf_inet_addr u3;
 | 
						union nf_inet_addr u3;
 | 
				
			||||||
	union nf_conntrack_man_proto u;
 | 
						union nf_conntrack_man_proto u;
 | 
				
			||||||
	/* Layer 3 protocol */
 | 
						/* Layer 3 protocol */
 | 
				
			||||||
| 
						 | 
					@ -61,8 +59,7 @@ struct nf_conntrack_man
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* This contains the information to distinguish a connection. */
 | 
					/* This contains the information to distinguish a connection. */
 | 
				
			||||||
struct nf_conntrack_tuple
 | 
					struct nf_conntrack_tuple {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct nf_conntrack_man src;
 | 
						struct nf_conntrack_man src;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* These are the parts of the tuple which are fixed. */
 | 
						/* These are the parts of the tuple which are fixed. */
 | 
				
			||||||
| 
						 | 
					@ -100,8 +97,7 @@ struct nf_conntrack_tuple
 | 
				
			||||||
	} dst;
 | 
						} dst;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct nf_conntrack_tuple_mask
 | 
					struct nf_conntrack_tuple_mask {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct {
 | 
						struct {
 | 
				
			||||||
		union nf_inet_addr u3;
 | 
							union nf_inet_addr u3;
 | 
				
			||||||
		union nf_conntrack_man_proto u;
 | 
							union nf_conntrack_man_proto u;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,8 +5,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define NF_NAT_MAPPING_TYPE_MAX_NAMELEN 16
 | 
					#define NF_NAT_MAPPING_TYPE_MAX_NAMELEN 16
 | 
				
			||||||
 | 
					
 | 
				
			||||||
enum nf_nat_manip_type
 | 
					enum nf_nat_manip_type {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	IP_NAT_MANIP_SRC,
 | 
						IP_NAT_MANIP_SRC,
 | 
				
			||||||
	IP_NAT_MANIP_DST
 | 
						IP_NAT_MANIP_DST
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
| 
						 | 
					@ -30,8 +29,7 @@ struct nf_nat_seq {
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Single range specification. */
 | 
					/* Single range specification. */
 | 
				
			||||||
struct nf_nat_range
 | 
					struct nf_nat_range {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	/* Set to OR of flags above. */
 | 
						/* Set to OR of flags above. */
 | 
				
			||||||
	unsigned int flags;
 | 
						unsigned int flags;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -43,8 +41,7 @@ struct nf_nat_range
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* For backwards compat: don't use in modern code. */
 | 
					/* For backwards compat: don't use in modern code. */
 | 
				
			||||||
struct nf_nat_multi_range_compat
 | 
					struct nf_nat_multi_range_compat {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	unsigned int rangesize; /* Must be 1. */
 | 
						unsigned int rangesize; /* Must be 1. */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* hangs off end. */
 | 
						/* hangs off end. */
 | 
				
			||||||
| 
						 | 
					@ -57,8 +54,7 @@ struct nf_nat_multi_range_compat
 | 
				
			||||||
#include <net/netfilter/nf_conntrack_extend.h>
 | 
					#include <net/netfilter/nf_conntrack_extend.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* per conntrack: nat application helper private data */
 | 
					/* per conntrack: nat application helper private data */
 | 
				
			||||||
union nf_conntrack_nat_help
 | 
					union nf_conntrack_nat_help {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	/* insert nat helper private data here */
 | 
						/* insert nat helper private data here */
 | 
				
			||||||
	struct nf_nat_pptp nat_pptp_info;
 | 
						struct nf_nat_pptp nat_pptp_info;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
| 
						 | 
					@ -66,8 +62,7 @@ union nf_conntrack_nat_help
 | 
				
			||||||
struct nf_conn;
 | 
					struct nf_conn;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* The structure embedded in the conntrack structure. */
 | 
					/* The structure embedded in the conntrack structure. */
 | 
				
			||||||
struct nf_conn_nat
 | 
					struct nf_conn_nat {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct hlist_node bysource;
 | 
						struct hlist_node bysource;
 | 
				
			||||||
	struct nf_nat_seq seq[IP_CT_DIR_MAX];
 | 
						struct nf_nat_seq seq[IP_CT_DIR_MAX];
 | 
				
			||||||
	struct nf_conn *ct;
 | 
						struct nf_conn *ct;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,8 +6,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct nf_nat_range;
 | 
					struct nf_nat_range;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct nf_nat_protocol
 | 
					struct nf_nat_protocol {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	/* Protocol number. */
 | 
						/* Protocol number. */
 | 
				
			||||||
	unsigned int protonum;
 | 
						unsigned int protonum;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,8 +7,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Basic packet classifier frontend definitions. */
 | 
					/* Basic packet classifier frontend definitions. */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct tcf_walker
 | 
					struct tcf_walker {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	int	stop;
 | 
						int	stop;
 | 
				
			||||||
	int	skip;
 | 
						int	skip;
 | 
				
			||||||
	int	count;
 | 
						int	count;
 | 
				
			||||||
| 
						 | 
					@ -61,8 +60,7 @@ tcf_unbind_filter(struct tcf_proto *tp, struct tcf_result *r)
 | 
				
			||||||
		tp->q->ops->cl_ops->unbind_tcf(tp->q, cl);
 | 
							tp->q->ops->cl_ops->unbind_tcf(tp->q, cl);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct tcf_exts
 | 
					struct tcf_exts {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
#ifdef CONFIG_NET_CLS_ACT
 | 
					#ifdef CONFIG_NET_CLS_ACT
 | 
				
			||||||
	struct tc_action *action;
 | 
						struct tc_action *action;
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
| 
						 | 
					@ -71,8 +69,7 @@ struct tcf_exts
 | 
				
			||||||
/* Map to export classifier specific extension TLV types to the
 | 
					/* Map to export classifier specific extension TLV types to the
 | 
				
			||||||
 * generic extensions API. Unsupported extensions must be set to 0.
 | 
					 * generic extensions API. Unsupported extensions must be set to 0.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
struct tcf_ext_map
 | 
					struct tcf_ext_map {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	int action;
 | 
						int action;
 | 
				
			||||||
	int police;
 | 
						int police;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
| 
						 | 
					@ -143,8 +140,7 @@ extern int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts,
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * struct tcf_pkt_info - packet information
 | 
					 * struct tcf_pkt_info - packet information
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
struct tcf_pkt_info
 | 
					struct tcf_pkt_info {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	unsigned char *		ptr;
 | 
						unsigned char *		ptr;
 | 
				
			||||||
	int			nexthdr;
 | 
						int			nexthdr;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
| 
						 | 
					@ -162,8 +158,7 @@ struct tcf_ematch_ops;
 | 
				
			||||||
 * @datalen: length of the ematch specific configuration data
 | 
					 * @datalen: length of the ematch specific configuration data
 | 
				
			||||||
 * @data: ematch specific data
 | 
					 * @data: ematch specific data
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
struct tcf_ematch
 | 
					struct tcf_ematch {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct tcf_ematch_ops * ops;
 | 
						struct tcf_ematch_ops * ops;
 | 
				
			||||||
	unsigned long		data;
 | 
						unsigned long		data;
 | 
				
			||||||
	unsigned int		datalen;
 | 
						unsigned int		datalen;
 | 
				
			||||||
| 
						 | 
					@ -211,8 +206,7 @@ static inline int tcf_em_early_end(struct tcf_ematch *em, int result)
 | 
				
			||||||
 * @hdr: ematch tree header supplied by userspace
 | 
					 * @hdr: ematch tree header supplied by userspace
 | 
				
			||||||
 * @matches: array of ematches
 | 
					 * @matches: array of ematches
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
struct tcf_ematch_tree
 | 
					struct tcf_ematch_tree {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct tcf_ematch_tree_hdr hdr;
 | 
						struct tcf_ematch_tree_hdr hdr;
 | 
				
			||||||
	struct tcf_ematch *	matches;
 | 
						struct tcf_ematch *	matches;
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
| 
						 | 
					@ -230,8 +224,7 @@ struct tcf_ematch_tree
 | 
				
			||||||
 * @owner: owner, must be set to THIS_MODULE
 | 
					 * @owner: owner, must be set to THIS_MODULE
 | 
				
			||||||
 * @link: link to previous/next ematch module (internal use)
 | 
					 * @link: link to previous/next ematch module (internal use)
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
struct tcf_ematch_ops
 | 
					struct tcf_ematch_ops {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	int			kind;
 | 
						int			kind;
 | 
				
			||||||
	int			datalen;
 | 
						int			datalen;
 | 
				
			||||||
	int			(*change)(struct tcf_proto *, void *,
 | 
						int			(*change)(struct tcf_proto *, void *,
 | 
				
			||||||
| 
						 | 
					@ -302,8 +295,7 @@ static inline int tcf_em_tree_match(struct sk_buff *skb,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#else /* CONFIG_NET_EMATCH */
 | 
					#else /* CONFIG_NET_EMATCH */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct tcf_ematch_tree
 | 
					struct tcf_ematch_tree {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define tcf_em_tree_validate(tp, tb, t) ((void)(t), 0)
 | 
					#define tcf_em_tree_validate(tp, tb, t) ((void)(t), 0)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,8 +5,7 @@
 | 
				
			||||||
#include <linux/ktime.h>
 | 
					#include <linux/ktime.h>
 | 
				
			||||||
#include <net/sch_generic.h>
 | 
					#include <net/sch_generic.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct qdisc_walker
 | 
					struct qdisc_walker {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	int	stop;
 | 
						int	stop;
 | 
				
			||||||
	int	skip;
 | 
						int	skip;
 | 
				
			||||||
	int	count;
 | 
						int	count;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -47,8 +47,7 @@ struct net_protocol {
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
 | 
					#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
 | 
				
			||||||
struct inet6_protocol 
 | 
					struct inet6_protocol {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	int	(*handler)(struct sk_buff *skb);
 | 
						int	(*handler)(struct sk_buff *skb);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	void	(*err_handler)(struct sk_buff *skb,
 | 
						void	(*err_handler)(struct sk_buff *skb,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -90,8 +90,7 @@
 | 
				
			||||||
#define RED_STAB_SIZE	256
 | 
					#define RED_STAB_SIZE	256
 | 
				
			||||||
#define RED_STAB_MASK	(RED_STAB_SIZE - 1)
 | 
					#define RED_STAB_MASK	(RED_STAB_SIZE - 1)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct red_stats
 | 
					struct red_stats {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	u32		prob_drop;	/* Early probability drops */
 | 
						u32		prob_drop;	/* Early probability drops */
 | 
				
			||||||
	u32		prob_mark;	/* Early probability marks */
 | 
						u32		prob_mark;	/* Early probability marks */
 | 
				
			||||||
	u32		forced_drop;	/* Forced drops, qavg > max_thresh */
 | 
						u32		forced_drop;	/* Forced drops, qavg > max_thresh */
 | 
				
			||||||
| 
						 | 
					@ -101,8 +100,7 @@ struct red_stats
 | 
				
			||||||
	u32		backlog;
 | 
						u32		backlog;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct red_parms
 | 
					struct red_parms {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	/* Parameters */
 | 
						/* Parameters */
 | 
				
			||||||
	u32		qth_min;	/* Min avg length threshold: A scaled */
 | 
						u32		qth_min;	/* Min avg length threshold: A scaled */
 | 
				
			||||||
	u32		qth_max;	/* Max avg length threshold: A scaled */
 | 
						u32		qth_max;	/* Max avg length threshold: A scaled */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -49,10 +49,8 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct fib_nh;
 | 
					struct fib_nh;
 | 
				
			||||||
struct inet_peer;
 | 
					struct inet_peer;
 | 
				
			||||||
struct rtable
 | 
					struct rtable {
 | 
				
			||||||
{
 | 
						union {
 | 
				
			||||||
	union
 | 
					 | 
				
			||||||
	{
 | 
					 | 
				
			||||||
		struct dst_entry	dst;
 | 
							struct dst_entry	dst;
 | 
				
			||||||
	} u;
 | 
						} u;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -77,16 +75,14 @@ struct rtable
 | 
				
			||||||
	struct inet_peer	*peer; /* long-living peer info */
 | 
						struct inet_peer	*peer; /* long-living peer info */
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct ip_rt_acct
 | 
					struct ip_rt_acct {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	__u32 	o_bytes;
 | 
						__u32 	o_bytes;
 | 
				
			||||||
	__u32 	o_packets;
 | 
						__u32 	o_packets;
 | 
				
			||||||
	__u32 	i_bytes;
 | 
						__u32 	i_bytes;
 | 
				
			||||||
	__u32 	i_packets;
 | 
						__u32 	i_packets;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct rt_cache_stat 
 | 
					struct rt_cache_stat {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
        unsigned int in_hit;
 | 
					        unsigned int in_hit;
 | 
				
			||||||
        unsigned int in_slow_tot;
 | 
					        unsigned int in_slow_tot;
 | 
				
			||||||
        unsigned int in_slow_mc;
 | 
					        unsigned int in_slow_mc;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -15,16 +15,14 @@ struct qdisc_walker;
 | 
				
			||||||
struct tcf_walker;
 | 
					struct tcf_walker;
 | 
				
			||||||
struct module;
 | 
					struct module;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct qdisc_rate_table
 | 
					struct qdisc_rate_table {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct tc_ratespec rate;
 | 
						struct tc_ratespec rate;
 | 
				
			||||||
	u32		data[256];
 | 
						u32		data[256];
 | 
				
			||||||
	struct qdisc_rate_table *next;
 | 
						struct qdisc_rate_table *next;
 | 
				
			||||||
	int		refcnt;
 | 
						int		refcnt;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
enum qdisc_state_t
 | 
					enum qdisc_state_t {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	__QDISC_STATE_RUNNING,
 | 
						__QDISC_STATE_RUNNING,
 | 
				
			||||||
	__QDISC_STATE_SCHED,
 | 
						__QDISC_STATE_SCHED,
 | 
				
			||||||
	__QDISC_STATE_DEACTIVATED,
 | 
						__QDISC_STATE_DEACTIVATED,
 | 
				
			||||||
| 
						 | 
					@ -37,8 +35,7 @@ struct qdisc_size_table {
 | 
				
			||||||
	u16			data[];
 | 
						u16			data[];
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct Qdisc
 | 
					struct Qdisc {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	int 			(*enqueue)(struct sk_buff *skb, struct Qdisc *dev);
 | 
						int 			(*enqueue)(struct sk_buff *skb, struct Qdisc *dev);
 | 
				
			||||||
	struct sk_buff *	(*dequeue)(struct Qdisc *dev);
 | 
						struct sk_buff *	(*dequeue)(struct Qdisc *dev);
 | 
				
			||||||
	unsigned		flags;
 | 
						unsigned		flags;
 | 
				
			||||||
| 
						 | 
					@ -78,8 +75,7 @@ struct Qdisc
 | 
				
			||||||
	struct gnet_stats_queue	qstats;
 | 
						struct gnet_stats_queue	qstats;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct Qdisc_class_ops
 | 
					struct Qdisc_class_ops {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	/* Child qdisc manipulation */
 | 
						/* Child qdisc manipulation */
 | 
				
			||||||
	struct netdev_queue *	(*select_queue)(struct Qdisc *, struct tcmsg *);
 | 
						struct netdev_queue *	(*select_queue)(struct Qdisc *, struct tcmsg *);
 | 
				
			||||||
	int			(*graft)(struct Qdisc *, unsigned long cl,
 | 
						int			(*graft)(struct Qdisc *, unsigned long cl,
 | 
				
			||||||
| 
						 | 
					@ -108,8 +104,7 @@ struct Qdisc_class_ops
 | 
				
			||||||
					struct gnet_dump *);
 | 
										struct gnet_dump *);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct Qdisc_ops
 | 
					struct Qdisc_ops {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct Qdisc_ops	*next;
 | 
						struct Qdisc_ops	*next;
 | 
				
			||||||
	const struct Qdisc_class_ops	*cl_ops;
 | 
						const struct Qdisc_class_ops	*cl_ops;
 | 
				
			||||||
	char			id[IFNAMSIZ];
 | 
						char			id[IFNAMSIZ];
 | 
				
			||||||
| 
						 | 
					@ -133,14 +128,12 @@ struct Qdisc_ops
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct tcf_result
 | 
					struct tcf_result {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	unsigned long	class;
 | 
						unsigned long	class;
 | 
				
			||||||
	u32		classid;
 | 
						u32		classid;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct tcf_proto_ops
 | 
					struct tcf_proto_ops {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct tcf_proto_ops	*next;
 | 
						struct tcf_proto_ops	*next;
 | 
				
			||||||
	char			kind[IFNAMSIZ];
 | 
						char			kind[IFNAMSIZ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -164,8 +157,7 @@ struct tcf_proto_ops
 | 
				
			||||||
	struct module		*owner;
 | 
						struct module		*owner;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct tcf_proto
 | 
					struct tcf_proto {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	/* Fast access part */
 | 
						/* Fast access part */
 | 
				
			||||||
	struct tcf_proto	*next;
 | 
						struct tcf_proto	*next;
 | 
				
			||||||
	void			*root;
 | 
						void			*root;
 | 
				
			||||||
| 
						 | 
					@ -261,14 +253,12 @@ extern struct Qdisc_ops noop_qdisc_ops;
 | 
				
			||||||
extern struct Qdisc_ops pfifo_fast_ops;
 | 
					extern struct Qdisc_ops pfifo_fast_ops;
 | 
				
			||||||
extern struct Qdisc_ops mq_qdisc_ops;
 | 
					extern struct Qdisc_ops mq_qdisc_ops;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct Qdisc_class_common
 | 
					struct Qdisc_class_common {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	u32			classid;
 | 
						u32			classid;
 | 
				
			||||||
	struct hlist_node	hnode;
 | 
						struct hlist_node	hnode;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct Qdisc_class_hash
 | 
					struct Qdisc_class_hash {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct hlist_head	*hash;
 | 
						struct hlist_head	*hash;
 | 
				
			||||||
	unsigned int		hashsize;
 | 
						unsigned int		hashsize;
 | 
				
			||||||
	unsigned int		hashmask;
 | 
						unsigned int		hashmask;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,15 +12,13 @@
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
#define SCM_MAX_FD	255
 | 
					#define SCM_MAX_FD	255
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct scm_fp_list
 | 
					struct scm_fp_list {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct list_head	list;
 | 
						struct list_head	list;
 | 
				
			||||||
	int			count;
 | 
						int			count;
 | 
				
			||||||
	struct file		*fp[SCM_MAX_FD];
 | 
						struct file		*fp[SCM_MAX_FD];
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct scm_cookie
 | 
					struct scm_cookie {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct ucred		creds;		/* Skb credentials	*/
 | 
						struct ucred		creds;		/* Skb credentials	*/
 | 
				
			||||||
	struct scm_fp_list	*fp;		/* Passed files		*/
 | 
						struct scm_fp_list	*fp;		/* Passed files		*/
 | 
				
			||||||
#ifdef CONFIG_SECURITY_NETWORK
 | 
					#ifdef CONFIG_SECURITY_NETWORK
 | 
				
			||||||
| 
						 | 
					@ -88,8 +86,7 @@ static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct sc
 | 
				
			||||||
static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg,
 | 
					static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg,
 | 
				
			||||||
				struct scm_cookie *scm, int flags)
 | 
									struct scm_cookie *scm, int flags)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	if (!msg->msg_control)
 | 
						if (!msg->msg_control) {
 | 
				
			||||||
	{
 | 
					 | 
				
			||||||
		if (test_bit(SOCK_PASSCRED, &sock->flags) || scm->fp)
 | 
							if (test_bit(SOCK_PASSCRED, &sock->flags) || scm->fp)
 | 
				
			||||||
			msg->msg_flags |= MSG_CTRUNC;
 | 
								msg->msg_flags |= MSG_CTRUNC;
 | 
				
			||||||
		scm_destroy(scm);
 | 
							scm_destroy(scm);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -227,8 +227,7 @@ DECLARE_SNMP_STAT(struct sctp_mib, sctp_statistics);
 | 
				
			||||||
#endif /* !TEST_FRAME */
 | 
					#endif /* !TEST_FRAME */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* sctp mib definitions */
 | 
					/* sctp mib definitions */
 | 
				
			||||||
enum
 | 
					enum {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	SCTP_MIB_NUM = 0,
 | 
						SCTP_MIB_NUM = 0,
 | 
				
			||||||
	SCTP_MIB_CURRESTAB,			/* CurrEstab */
 | 
						SCTP_MIB_CURRESTAB,			/* CurrEstab */
 | 
				
			||||||
	SCTP_MIB_ACTIVEESTABS,			/* ActiveEstabs */
 | 
						SCTP_MIB_ACTIVEESTABS,			/* ActiveEstabs */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -359,8 +359,7 @@ TCP_ECN_create_request(struct request_sock *req, struct tcphdr *th)
 | 
				
			||||||
		inet_rsk(req)->ecn_ok = 1;
 | 
							inet_rsk(req)->ecn_ok = 1;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
enum tcp_tw_status
 | 
					enum tcp_tw_status {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	TCP_TW_SUCCESS = 0,
 | 
						TCP_TW_SUCCESS = 0,
 | 
				
			||||||
	TCP_TW_RST = 1,
 | 
						TCP_TW_RST = 1,
 | 
				
			||||||
	TCP_TW_ACK = 2,
 | 
						TCP_TW_ACK = 2,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -121,8 +121,7 @@ struct xfrm_state_walk {
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Full description of state of transformer. */
 | 
					/* Full description of state of transformer. */
 | 
				
			||||||
struct xfrm_state
 | 
					struct xfrm_state {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
#ifdef CONFIG_NET_NS
 | 
					#ifdef CONFIG_NET_NS
 | 
				
			||||||
	struct net		*xs_net;
 | 
						struct net		*xs_net;
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
| 
						 | 
					@ -237,8 +236,7 @@ enum {
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* callback structure passed from either netlink or pfkey */
 | 
					/* callback structure passed from either netlink or pfkey */
 | 
				
			||||||
struct km_event
 | 
					struct km_event {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	union {
 | 
						union {
 | 
				
			||||||
		u32 hard;
 | 
							u32 hard;
 | 
				
			||||||
		u32 proto;
 | 
							u32 proto;
 | 
				
			||||||
| 
						 | 
					@ -313,8 +311,7 @@ extern int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
extern void xfrm_state_delete_tunnel(struct xfrm_state *x);
 | 
					extern void xfrm_state_delete_tunnel(struct xfrm_state *x);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct xfrm_type
 | 
					struct xfrm_type {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	char			*description;
 | 
						char			*description;
 | 
				
			||||||
	struct module		*owner;
 | 
						struct module		*owner;
 | 
				
			||||||
	__u8			proto;
 | 
						__u8			proto;
 | 
				
			||||||
| 
						 | 
					@ -420,8 +417,7 @@ static inline struct xfrm_mode *xfrm_ip2inner_mode(struct xfrm_state *x, int ipp
 | 
				
			||||||
		return x->inner_mode_iaf;
 | 
							return x->inner_mode_iaf;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct xfrm_tmpl
 | 
					struct xfrm_tmpl {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
/* id in template is interpreted as:
 | 
					/* id in template is interpreted as:
 | 
				
			||||||
 * daddr - destination of tunnel, may be zero for transport mode.
 | 
					 * daddr - destination of tunnel, may be zero for transport mode.
 | 
				
			||||||
 * spi   - zero to acquire spi. Not zero if spi is static, then
 | 
					 * spi   - zero to acquire spi. Not zero if spi is static, then
 | 
				
			||||||
| 
						 | 
					@ -468,8 +464,7 @@ struct xfrm_policy_walk {
 | 
				
			||||||
	u32 seq;
 | 
						u32 seq;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct xfrm_policy
 | 
					struct xfrm_policy {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
#ifdef CONFIG_NET_NS
 | 
					#ifdef CONFIG_NET_NS
 | 
				
			||||||
	struct net		*xp_net;
 | 
						struct net		*xp_net;
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
| 
						 | 
					@ -538,8 +533,7 @@ struct xfrm_migrate {
 | 
				
			||||||
/* default seq threshold size */
 | 
					/* default seq threshold size */
 | 
				
			||||||
#define XFRM_AE_SEQT_SIZE		2
 | 
					#define XFRM_AE_SEQT_SIZE		2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct xfrm_mgr
 | 
					struct xfrm_mgr {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct list_head	list;
 | 
						struct list_head	list;
 | 
				
			||||||
	char			*id;
 | 
						char			*id;
 | 
				
			||||||
	int			(*notify)(struct xfrm_state *x, struct km_event *c);
 | 
						int			(*notify)(struct xfrm_state *x, struct km_event *c);
 | 
				
			||||||
| 
						 | 
					@ -626,8 +620,7 @@ struct xfrm_spi_skb_cb {
 | 
				
			||||||
#define XFRM_SPI_SKB_CB(__skb) ((struct xfrm_spi_skb_cb *)&((__skb)->cb[0]))
 | 
					#define XFRM_SPI_SKB_CB(__skb) ((struct xfrm_spi_skb_cb *)&((__skb)->cb[0]))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Audit Information */
 | 
					/* Audit Information */
 | 
				
			||||||
struct xfrm_audit
 | 
					struct xfrm_audit {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	u32	secid;
 | 
						u32	secid;
 | 
				
			||||||
	uid_t	loginuid;
 | 
						uid_t	loginuid;
 | 
				
			||||||
	u32	sessionid;
 | 
						u32	sessionid;
 | 
				
			||||||
| 
						 | 
					@ -871,8 +864,7 @@ static inline int xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ct
 | 
				
			||||||
 * bundles differing by session id. All the bundles grow from a parent
 | 
					 * bundles differing by session id. All the bundles grow from a parent
 | 
				
			||||||
 * policy rule.
 | 
					 * policy rule.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
struct xfrm_dst
 | 
					struct xfrm_dst {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	union {
 | 
						union {
 | 
				
			||||||
		struct dst_entry	dst;
 | 
							struct dst_entry	dst;
 | 
				
			||||||
		struct rtable		rt;
 | 
							struct rtable		rt;
 | 
				
			||||||
| 
						 | 
					@ -907,8 +899,7 @@ static inline void xfrm_dst_destroy(struct xfrm_dst *xdst)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
extern void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev);
 | 
					extern void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct sec_path
 | 
					struct sec_path {
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	atomic_t		refcnt;
 | 
						atomic_t		refcnt;
 | 
				
			||||||
	int			len;
 | 
						int			len;
 | 
				
			||||||
	struct xfrm_state	*xvec[XFRM_MAX_DEPTH];
 | 
						struct xfrm_state	*xvec[XFRM_MAX_DEPTH];
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue