~ubuntu-branches/debian/experimental/linux-tools/experimental

« back to all changes in this revision

Viewing changes to include/net/netfilter/nf_nat_core.h

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings
  • Date: 2014-02-02 16:57:49 UTC
  • mfrom: (1.1.10) (0.1.21 sid)
  • Revision ID: package-import@ubuntu.com-20140202165749-tw94o9t1t0a8txk6
Tags: 3.13-1~exp2
Merge changes from sid up to 3.12.6-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
7
7
/* This header used to share core functionality between the standalone
8
8
   NAT module, and the compatibility layer's use of NAT for masquerading. */
9
9
 
10
 
extern unsigned int nf_nat_packet(struct nf_conn *ct,
11
 
                                  enum ip_conntrack_info ctinfo,
12
 
                                  unsigned int hooknum,
13
 
                                  struct sk_buff *skb);
 
10
unsigned int nf_nat_packet(struct nf_conn *ct, enum ip_conntrack_info ctinfo,
 
11
                           unsigned int hooknum, struct sk_buff *skb);
14
12
 
15
 
extern int nf_xfrm_me_harder(struct sk_buff *skb, unsigned int family);
 
13
int nf_xfrm_me_harder(struct sk_buff *skb, unsigned int family);
16
14
 
17
15
static inline int nf_nat_initialized(struct nf_conn *ct,
18
16
                                     enum nf_nat_manip_type manip)