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

Commit 88d2d28b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

parents 720dc34b 9ef0298a

net/netfilter/ipvs/ip_vs_ctl.c

+2 −2
Original line number Diff line number Diff line
@@ -808,9 +808,9 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest, 
	dest->u_threshold = udest->u_threshold;

	dest->l_threshold = udest->l_threshold;



	spin_lock(&dest->dst_lock);

	spin_lock_bh(&dest->dst_lock);

	ip_vs_dst_reset(dest);

	spin_unlock(&dest->dst_lock);

	spin_unlock_bh(&dest->dst_lock);



	if (add)

		ip_vs_new_estimator(&dest->stats);

net/netfilter/nf_log.c

+4 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ EXPORT_SYMBOL(nf_log_unregister); 


int nf_log_bind_pf(u_int8_t pf, const struct nf_logger *logger)

{

	if (pf >= ARRAY_SIZE(nf_loggers))

		return -EINVAL;

	mutex_lock(&nf_log_mutex);

	if (__find_logger(pf, logger->name) == NULL) {

		mutex_unlock(&nf_log_mutex);
@@ -98,6 +100,8 @@ EXPORT_SYMBOL(nf_log_bind_pf); 


void nf_log_unbind_pf(u_int8_t pf)

{

	if (pf >= ARRAY_SIZE(nf_loggers))

		return;

	mutex_lock(&nf_log_mutex);

	rcu_assign_pointer(nf_loggers[pf], NULL);

	mutex_unlock(&nf_log_mutex);