Merge "msm-5.4: net: Compilation issue in nf_conntrack_sip.c"

This commit is contained in:
qctecmdr 2020-12-18 18:04:11 -08:00 • committed by Gerrit - the friendly Code Review server
commit bd2b139fb4

View file

@ -1884,7 +1884,7 @@ static void sip_tcp_skip_process(int ret, struct nf_conn *ct, struct sk_buff *sk
hooks = rcu_dereference(nf_nat_sip_hooks);
if (hooks)
hooks->seq_adjust(skb, protoff, tdiff);
hooks->seq_adjust(skb, protoff, *tdiff);
}
}
@ -2104,7 +2104,7 @@ destination:
here:
#endif
sip_tcp_skip_process(ret, ct, skb, protoff, tdiff);
sip_tcp_skip_process(ret, ct, skb, protoff, &tdiff);
return ret;
}