Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd2b139f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 8168d364 534d5696

net/netfilter/nf_conntrack_sip.c

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ static int sip_help_tcp(struct sk_buff *skb, unsigned int protoff, 


here:

#endif

	sip_tcp_skip_process(ret, ct, skb, protoff, tdiff);

	sip_tcp_skip_process(ret, ct, skb, protoff, &tdiff);



	return ret;

}