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

Commit 4d316f3f authored by Julian Anastasov's avatar Julian Anastasov Committed by Simon Horman
Browse files

ipvs: use correct address family in scheduler logs 



Needed to support svc->af != dest->af.

Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarAlex Gartrell <agartrell@fb.com>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent cf34e646

net/netfilter/ipvs/ip_vs_dh.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ ip_vs_dh_schedule(struct ip_vs_service *svc, const struct sk_buff *skb, 


	IP_VS_DBG_BUF(6, "DH: destination IP address %s --> server %s:%d\n",

		      IP_VS_DBG_ADDR(svc->af, &iph->daddr),

		      IP_VS_DBG_ADDR(svc->af, &dest->addr),

		      IP_VS_DBG_ADDR(dest->af, &dest->addr),

		      ntohs(dest->port));



	return dest;

net/netfilter/ipvs/ip_vs_fo.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ ip_vs_fo_schedule(struct ip_vs_service *svc, const struct sk_buff *skb, 


	if (hweight) {

		IP_VS_DBG_BUF(6, "FO: server %s:%u activeconns %d weight %d\n",

			      IP_VS_DBG_ADDR(svc->af, &hweight->addr),

			      IP_VS_DBG_ADDR(hweight->af, &hweight->addr),

			      ntohs(hweight->port),

			      atomic_read(&hweight->activeconns),

			      atomic_read(&hweight->weight));

net/netfilter/ipvs/ip_vs_lc.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ ip_vs_lc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb, 
	else

		IP_VS_DBG_BUF(6, "LC: server %s:%u activeconns %d "

			      "inactconns %d\n",

			      IP_VS_DBG_ADDR(svc->af, &least->addr),

			      IP_VS_DBG_ADDR(least->af, &least->addr),

			      ntohs(least->port),

			      atomic_read(&least->activeconns),

			      atomic_read(&least->inactconns));

net/netfilter/ipvs/ip_vs_nq.c

+2 −1
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ ip_vs_nq_schedule(struct ip_vs_service *svc, const struct sk_buff *skb, 
  out:

	IP_VS_DBG_BUF(6, "NQ: server %s:%u "

		      "activeconns %d refcnt %d weight %d overhead %d\n",

		      IP_VS_DBG_ADDR(svc->af, &least->addr), ntohs(least->port),

		      IP_VS_DBG_ADDR(least->af, &least->addr),

		      ntohs(least->port),

		      atomic_read(&least->activeconns),

		      atomic_read(&least->refcnt),

		      atomic_read(&least->weight), loh);

net/netfilter/ipvs/ip_vs_rr.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ ip_vs_rr_schedule(struct ip_vs_service *svc, const struct sk_buff *skb, 
	spin_unlock_bh(&svc->sched_lock);

	IP_VS_DBG_BUF(6, "RR: server %s:%u "

		      "activeconns %d refcnt %d weight %d\n",

		      IP_VS_DBG_ADDR(svc->af, &dest->addr), ntohs(dest->port),

		      IP_VS_DBG_ADDR(dest->af, &dest->addr), ntohs(dest->port),

		      atomic_read(&dest->activeconns),

		      atomic_read(&dest->refcnt), atomic_read(&dest->weight));