16c16
< * $FreeBSD: head/sys/net/if_tun.c 241394 2012-10-10 08:36:38Z kevlo $
---
> * $FreeBSD: head/sys/net/if_tun.c 241610 2012-10-16 13:37:54Z glebius $
102d101
< #define TUNNAME "tun"
110c109,110
< static MALLOC_DEFINE(M_TUN, TUNNAME, "Tunnel Interface");
---
> static const char tunname[] = "tun";
> static MALLOC_DEFINE(M_TUN, tunname, "Tunnel Interface");
136a137
> static struct if_clone *tun_cloner;
138,139d138
< IFC_SIMPLE_DECLARE(tun, 0);
<
176c175
< .d_name = TUNNAME,
---
> .d_name = tunname,
190c189
< UID_UUCP, GID_DIALER, 0600, "%s%d", ifc->ifc_name, unit);
---
> UID_UUCP, GID_DIALER, 0600, "%s%d", tunname, unit);
192c191
< tuncreate(ifc->ifc_name, dev);
---
> tuncreate(tunname, dev);
214c213
< if (strcmp(name, TUNNAME) == 0) {
---
> if (strcmp(name, tunname) == 0) {
216c215
< } else if (dev_stdclone(name, NULL, TUNNAME, &u) != 1)
---
> } else if (dev_stdclone(name, NULL, tunname, &u) != 1)
293c292,293
< if_clone_attach(&tun_cloner);
---
> tun_cloner = if_clone_simple(tunname, tun_clone_create,
> tun_clone_destroy, 0);
296c296
< if_clone_detach(&tun_cloner);
---
> if_clone_detach(tun_cloner);
411c411
< tuncreate(TUNNAME, dev);
---
> tuncreate(tunname, dev);