Commit 3db05fea authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[NETFILTER]: Replace sk_buff ** with sk_buff * 



With all the users of the double pointers removed, this patch mops up by
finally replacing all occurances of sk_buff ** in the netfilter API by
sk_buff *.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2ca7b0ac

include/linux/if_bridge.h

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ struct __fdb_entry 
extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *));

extern struct sk_buff *(*br_handle_frame_hook)(struct net_bridge_port *p,

					       struct sk_buff *skb);

extern int (*br_should_route_hook)(struct sk_buff **pskb);

extern int (*br_should_route_hook)(struct sk_buff *skb);



#endif

include/linux/netfilter.h

+12 −12
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ struct sk_buff; 
struct net_device;



typedef unsigned int nf_hookfn(unsigned int hooknum,

			       struct sk_buff **skb,

			       struct sk_buff *skb,

			       const struct net_device *in,

			       const struct net_device *out,

			       int (*okfn)(struct sk_buff *));
@@ -183,7 +183,7 @@ void nf_log_packet(int pf, 
		   struct nf_loginfo *li,

		   const char *fmt, ...);



int nf_hook_slow(int pf, unsigned int hook, struct sk_buff **pskb,

int nf_hook_slow(int pf, unsigned int hook, struct sk_buff *skb,

		 struct net_device *indev, struct net_device *outdev,

		 int (*okfn)(struct sk_buff *), int thresh);
@@ -195,7 +195,7 @@ int nf_hook_slow(int pf, unsigned int hook, struct sk_buff **pskb, 
 *	value indicates the packet has been consumed by the hook.

 */

static inline int nf_hook_thresh(int pf, unsigned int hook,

				 struct sk_buff **pskb,

				 struct sk_buff *skb,

				 struct net_device *indev,

				 struct net_device *outdev,

				 int (*okfn)(struct sk_buff *), int thresh,
@@ -207,14 +207,14 @@ static inline int nf_hook_thresh(int pf, unsigned int hook, 
	if (list_empty(&nf_hooks[pf][hook]))

		return 1;

#endif

	return nf_hook_slow(pf, hook, pskb, indev, outdev, okfn, thresh);

	return nf_hook_slow(pf, hook, skb, indev, outdev, okfn, thresh);

}



static inline int nf_hook(int pf, unsigned int hook, struct sk_buff **pskb,

static inline int nf_hook(int pf, unsigned int hook, struct sk_buff *skb,

			  struct net_device *indev, struct net_device *outdev,

			  int (*okfn)(struct sk_buff *))

{

	return nf_hook_thresh(pf, hook, pskb, indev, outdev, okfn, INT_MIN, 1);

	return nf_hook_thresh(pf, hook, skb, indev, outdev, okfn, INT_MIN, 1);

}

                   

/* Activate hook; either okfn or kfree_skb called, unless a hook
@@ -241,13 +241,13 @@ static inline int nf_hook(int pf, unsigned int hook, struct sk_buff **pskb, 


#define NF_HOOK_THRESH(pf, hook, skb, indev, outdev, okfn, thresh)	       \

({int __ret;								       \

if ((__ret=nf_hook_thresh(pf, hook, &(skb), indev, outdev, okfn, thresh, 1)) == 1)\

if ((__ret=nf_hook_thresh(pf, hook, (skb), indev, outdev, okfn, thresh, 1)) == 1)\

	__ret = (okfn)(skb);						       \

__ret;})



#define NF_HOOK_COND(pf, hook, skb, indev, outdev, okfn, cond)		       \

({int __ret;								       \

if ((__ret=nf_hook_thresh(pf, hook, &(skb), indev, outdev, okfn, INT_MIN, cond)) == 1)\

if ((__ret=nf_hook_thresh(pf, hook, (skb), indev, outdev, okfn, INT_MIN, cond)) == 1)\

	__ret = (okfn)(skb);						       \

__ret;})
@@ -317,7 +317,7 @@ struct nf_afinfo { 
				    unsigned int dataoff, u_int8_t protocol);

	void		(*saveroute)(const struct sk_buff *skb,

				     struct nf_info *info);

	int		(*reroute)(struct sk_buff **skb,

	int		(*reroute)(struct sk_buff *skb,

				   const struct nf_info *info);

	int		route_key_size;

};
@@ -371,15 +371,15 @@ extern struct proc_dir_entry *proc_net_netfilter; 
#define NF_HOOK(pf, hook, skb, indev, outdev, okfn) (okfn)(skb)

#define NF_HOOK_COND(pf, hook, skb, indev, outdev, okfn, cond) (okfn)(skb)

static inline int nf_hook_thresh(int pf, unsigned int hook,

				 struct sk_buff **pskb,

				 struct sk_buff *skb,

				 struct net_device *indev,

				 struct net_device *outdev,

				 int (*okfn)(struct sk_buff *), int thresh,

				 int cond)

{

	return okfn(*pskb);

	return okfn(skb);

}

static inline int nf_hook(int pf, unsigned int hook, struct sk_buff **pskb,

static inline int nf_hook(int pf, unsigned int hook, struct sk_buff *skb,

			  struct net_device *indev, struct net_device *outdev,

			  int (*okfn)(struct sk_buff *))

{

include/linux/netfilter/nf_conntrack_amanda.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#define _NF_CONNTRACK_AMANDA_H

/* AMANDA tracking. */



extern unsigned int (*nf_nat_amanda_hook)(struct sk_buff **pskb,

extern unsigned int (*nf_nat_amanda_hook)(struct sk_buff *skb,

					  enum ip_conntrack_info ctinfo,

					  unsigned int matchoff,

					  unsigned int matchlen,

include/linux/netfilter/nf_conntrack_ftp.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ struct nf_conntrack_expect; 


/* For NAT to hook in when we find a packet which describes what other

 * connection we should expect. */

extern unsigned int (*nf_nat_ftp_hook)(struct sk_buff **pskb,

extern unsigned int (*nf_nat_ftp_hook)(struct sk_buff *skb,

				       enum ip_conntrack_info ctinfo,

				       enum nf_ct_ftp_type type,

				       unsigned int matchoff,

include/linux/netfilter/nf_conntrack_h323.h

+9 −9
Original line number Diff line number Diff line
@@ -36,27 +36,27 @@ extern void nf_conntrack_h245_expect(struct nf_conn *new, 
				     struct nf_conntrack_expect *this);

extern void nf_conntrack_q931_expect(struct nf_conn *new,

				     struct nf_conntrack_expect *this);

extern int (*set_h245_addr_hook) (struct sk_buff **pskb,

extern int (*set_h245_addr_hook) (struct sk_buff *skb,

				  unsigned char **data, int dataoff,

				  H245_TransportAddress *taddr,

				  union nf_conntrack_address *addr,

				  __be16 port);

extern int (*set_h225_addr_hook) (struct sk_buff **pskb,

extern int (*set_h225_addr_hook) (struct sk_buff *skb,

				  unsigned char **data, int dataoff,

				  TransportAddress *taddr,

				  union nf_conntrack_address *addr,

				  __be16 port);

extern int (*set_sig_addr_hook) (struct sk_buff **pskb,

extern int (*set_sig_addr_hook) (struct sk_buff *skb,

				 struct nf_conn *ct,

				 enum ip_conntrack_info ctinfo,

				 unsigned char **data,

				 TransportAddress *taddr, int count);

extern int (*set_ras_addr_hook) (struct sk_buff **pskb,

extern int (*set_ras_addr_hook) (struct sk_buff *skb,

				 struct nf_conn *ct,

				 enum ip_conntrack_info ctinfo,

				 unsigned char **data,

				 TransportAddress *taddr, int count);

extern int (*nat_rtp_rtcp_hook) (struct sk_buff **pskb,

extern int (*nat_rtp_rtcp_hook) (struct sk_buff *skb,

				 struct nf_conn *ct,

				 enum ip_conntrack_info ctinfo,

				 unsigned char **data, int dataoff,
@@ -64,24 +64,24 @@ extern int (*nat_rtp_rtcp_hook) (struct sk_buff **pskb, 
				 __be16 port, __be16 rtp_port,

				 struct nf_conntrack_expect *rtp_exp,

				 struct nf_conntrack_expect *rtcp_exp);

extern int (*nat_t120_hook) (struct sk_buff **pskb, struct nf_conn *ct,

extern int (*nat_t120_hook) (struct sk_buff *skb, struct nf_conn *ct,

			     enum ip_conntrack_info ctinfo,

			     unsigned char **data, int dataoff,

			     H245_TransportAddress *taddr, __be16 port,

			     struct nf_conntrack_expect *exp);

extern int (*nat_h245_hook) (struct sk_buff **pskb, struct nf_conn *ct,

extern int (*nat_h245_hook) (struct sk_buff *skb, struct nf_conn *ct,

			     enum ip_conntrack_info ctinfo,

			     unsigned char **data, int dataoff,

			     TransportAddress *taddr, __be16 port,

			     struct nf_conntrack_expect *exp);

extern int (*nat_callforwarding_hook) (struct sk_buff **pskb,

extern int (*nat_callforwarding_hook) (struct sk_buff *skb,

				       struct nf_conn *ct,

				       enum ip_conntrack_info ctinfo,

				       unsigned char **data, int dataoff,

				       TransportAddress *taddr,

				       __be16 port,

				       struct nf_conntrack_expect *exp);

extern int (*nat_q931_hook) (struct sk_buff **pskb, struct nf_conn *ct,

extern int (*nat_q931_hook) (struct sk_buff *skb, struct nf_conn *ct,

			     enum ip_conntrack_info ctinfo,

			     unsigned char **data, TransportAddress *taddr,

			     int idx, __be16 port,