mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
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" <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
33224b16ff
commit
ede2059dba
18 changed files with 45 additions and 53 deletions
|
|
@ -744,7 +744,7 @@ out:
|
|||
return NET_RX_DROP;
|
||||
}
|
||||
|
||||
static int dn_output(struct sock *sk, struct sk_buff *skb)
|
||||
static int dn_output(struct net *net, struct sock *sk, struct sk_buff *skb)
|
||||
{
|
||||
struct dst_entry *dst = skb_dst(skb);
|
||||
struct dn_route *rt = (struct dn_route *)dst;
|
||||
|
|
@ -832,7 +832,7 @@ drop:
|
|||
* Used to catch bugs. This should never normally get
|
||||
* called.
|
||||
*/
|
||||
static int dn_rt_bug_sk(struct sock *sk, struct sk_buff *skb)
|
||||
static int dn_rt_bug_out(struct net *net, struct sock *sk, struct sk_buff *skb)
|
||||
{
|
||||
struct dn_skb_cb *cb = DN_SKB_CB(skb);
|
||||
|
||||
|
|
@ -1469,7 +1469,7 @@ make_route:
|
|||
|
||||
rt->n = neigh;
|
||||
rt->dst.lastuse = jiffies;
|
||||
rt->dst.output = dn_rt_bug_sk;
|
||||
rt->dst.output = dn_rt_bug_out;
|
||||
switch (res.type) {
|
||||
case RTN_UNICAST:
|
||||
rt->dst.input = dn_forward;
|
||||
|
|
|
|||
Loading…
Reference in a new issue