X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=net%2Fcore%2Fnetpoll.c;h=a664f7829a6d16db4579789ca5b8c40654cc78d7;hb=9955e8d15f53e53540aaed7bcef640142e65e900;hp=c03f3dec4763fc507edc56167cd8e88a209fb197;hpb=562e74fefc36eb57286455c68a60f2776659a7e1;p=~andy%2Flinux

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index c03f3dec476..a664f7829a6 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -948,6 +948,7 @@ int netpoll_parse_options(struct netpoll *np, char *opt)
 {
 	char *cur=opt, *delim;
 	int ipv6;
+	bool ipversion_set = false;
 
 	if (*cur != '@') {
 		if ((delim = strchr(cur, '@')) == NULL)
@@ -960,6 +961,7 @@ int netpoll_parse_options(struct netpoll *np, char *opt)
 	cur++;
 
 	if (*cur != '/') {
+		ipversion_set = true;
 		if ((delim = strchr(cur, '/')) == NULL)
 			goto parse_failed;
 		*delim = 0;
@@ -1002,7 +1004,7 @@ int netpoll_parse_options(struct netpoll *np, char *opt)
 	ipv6 = netpoll_parse_ip_addr(cur, &np->remote_ip);
 	if (ipv6 < 0)
 		goto parse_failed;
-	else if (np->ipv6 != (bool)ipv6)
+	else if (ipversion_set && np->ipv6 != (bool)ipv6)
 		goto parse_failed;
 	else
 		np->ipv6 = (bool)ipv6;