svn commit: r289169 - stable/10/sys/net

[Andrey V. Elsukov]

Author: ae
Date: Mon Oct 12 07:49:07 2015
New Revision: 289169
URL: https://svnweb.freebsd.org/changeset/base/289169

Log:
  MFC r288529:
    Always detach encap handler when reconfiguring tunnel.

Modified:
  stable/10/sys/net/if_gre.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/net/if_gre.c
==============================================================================
--- stable/10/sys/net/if_gre.c	Mon Oct 12 05:21:51 2015	(r289168)
+++ stable/10/sys/net/if_gre.c	Mon Oct 12 07:49:07 2015	(r289169)
@@ -624,7 +624,7 @@ gre_set_tunnel(struct ifnet *ifp, struct
 	default:
 		return (EAFNOSUPPORT);
 	}
-	if (sc->gre_family != src->sa_family)
+	if (sc->gre_family != 0)
 		gre_detach(sc);
 	GRE_WLOCK(sc);
 	if (sc->gre_family != 0)