summaryrefslogtreecommitdiffstats
path: root/include/net/lwtunnel.h
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2015-10-07 17:48:47 -0400
committerDavid S. Miller <davem@davemloft.net>2015-10-08 07:27:03 -0400
commitede2059dbaf9c6557a49d466c8c7778343b208ff (patch)
treed6d15cbeb675b52ef22890a2228b5301b1396c45 /include/net/lwtunnel.h
parent33224b16ffccb49cf798317670389e0bfba0024c (diff)
dst: Pass net into dst->output
The network namespace is already passed into dst_output pass it into dst->output lwt->output and friends. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/lwtunnel.h')
-rw-r--r--include/net/lwtunnel.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/net/lwtunnel.h b/include/net/lwtunnel.h
index fce0e35e74d0..66350ce3e955 100644
--- a/include/net/lwtunnel.h
+++ b/include/net/lwtunnel.h
@@ -18,7 +18,7 @@ struct lwtunnel_state {
18 __u16 type; 18 __u16 type;
19 __u16 flags; 19 __u16 flags;
20 atomic_t refcnt; 20 atomic_t refcnt;
21 int (*orig_output)(struct sock *sk, struct sk_buff *skb); 21 int (*orig_output)(struct net *net, struct sock *sk, struct sk_buff *skb);
22 int (*orig_input)(struct sk_buff *); 22 int (*orig_input)(struct sk_buff *);
23 int len; 23 int len;
24 __u8 data[0]; 24 __u8 data[0];
@@ -28,7 +28,7 @@ struct lwtunnel_encap_ops {
28 int (*build_state)(struct net_device *dev, struct nlattr *encap, 28 int (*build_state)(struct net_device *dev, struct nlattr *encap,
29 unsigned int family, const void *cfg, 29 unsigned int family, const void *cfg,
30 struct lwtunnel_state **ts); 30 struct lwtunnel_state **ts);
31 int (*output)(struct sock *sk, struct sk_buff *skb); 31 int (*output)(struct net *net, struct sock *sk, struct sk_buff *skb);
32 int (*input)(struct sk_buff *skb); 32 int (*input)(struct sk_buff *skb);
33 int (*fill_encap)(struct sk_buff *skb, 33 int (*fill_encap)(struct sk_buff *skb,
34 struct lwtunnel_state *lwtstate); 34 struct lwtunnel_state *lwtstate);
@@ -88,7 +88,7 @@ int lwtunnel_fill_encap(struct sk_buff *skb,
88int lwtunnel_get_encap_size(struct lwtunnel_state *lwtstate); 88int lwtunnel_get_encap_size(struct lwtunnel_state *lwtstate);
89struct lwtunnel_state *lwtunnel_state_alloc(int hdr_len); 89struct lwtunnel_state *lwtunnel_state_alloc(int hdr_len);
90int lwtunnel_cmp_encap(struct lwtunnel_state *a, struct lwtunnel_state *b); 90int lwtunnel_cmp_encap(struct lwtunnel_state *a, struct lwtunnel_state *b);
91int lwtunnel_output(struct sock *sk, struct sk_buff *skb); 91int lwtunnel_output(struct net *net, struct sock *sk, struct sk_buff *skb);
92int lwtunnel_input(struct sk_buff *skb); 92int lwtunnel_input(struct sk_buff *skb);
93 93
94#else 94#else
@@ -160,7 +160,7 @@ static inline int lwtunnel_cmp_encap(struct lwtunnel_state *a,
160 return 0; 160 return 0;
161} 161}
162 162
163static inline int lwtunnel_output(struct sock *sk, struct sk_buff *skb) 163static inline int lwtunnel_output(struct net *net, struct sock *sk, struct sk_buff *skb)
164{ 164{
165 return -EOPNOTSUPP; 165 return -EOPNOTSUPP;
166} 166}