Merge remote-tracking branch 'ipvs-next/master'

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index c3c809b2e7122daabac5b45ffed67979e0fecb28..6dc86cc33130ab7744d0761db3e21a85f78d1a1f 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -3267,7 +3267,7 @@ static int ip_vs_genl_dump_dests(struct sk_buff *skb,
 
 
        svc = ip_vs_genl_find_service(ipvs, attrs[IPVS_CMD_ATTR_SERVICE]);
-       if (IS_ERR(svc) || svc == NULL)
+       if (IS_ERR_OR_NULL(svc))
                goto out_err;
 
        /* Dump the destinations */