34c34
< * $FreeBSD: head/sys/net/if_tap.c 111741 2003-03-02 15:50:23Z des $
---
> * $FreeBSD: head/sys/net/if_tap.c 111742 2003-03-02 15:56:49Z des $
84c84
< static int tapmodevent(module_t, int, void *);
---
> static int tapmodevent(module_t, int, void *);
209,210c209,210
< KASSERT(!(tp->tap_flags & TAP_OPEN),
< ("%s%d flags is out of sync", ifp->if_name,
---
> KASSERT(!(tp->tap_flags & TAP_OPEN),
> ("%s%d flags is out of sync", ifp->if_name,
222c222
< if (tapbasedev != NOUDEV)
---
> if (tapbasedev != NOUDEV)
257c257
< r = rman_reserve_resource(tapunits, 0, TAPMAXUNIT, 1,
---
> r = rman_reserve_resource(tapunits, 0, TAPMAXUNIT, 1,
264c264
< r = rman_reserve_resource(vmnetunits, 0, TAPMAXUNIT, 1,
---
> r = rman_reserve_resource(vmnetunits, 0, TAPMAXUNIT, 1,
280c280
< TAPDEBUG("%s%d device exists. minor = %#x\n",
---
> TAPDEBUG("%s%d device exists. minor = %#x\n",
342c342
< dev = make_dev(&tap_cdevsw, minor(dev), UID_ROOT, GID_WHEEL,
---
> dev = make_dev(&tap_cdevsw, minor(dev), UID_ROOT, GID_WHEEL,
351c351
< /* fill the rest and attach interface */
---
> /* fill the rest and attach interface */
371c371
< TAPDEBUG("interface %s%d is created. minor = %#x\n",
---
> TAPDEBUG("interface %s%d is created. minor = %#x\n",
377c377
< * tapopen
---
> * tapopen
398c398
< r = rman_reserve_resource(vmnetunits, unit, unit, 1,
---
> r = rman_reserve_resource(vmnetunits, unit, unit, 1,
401c401
< r = rman_reserve_resource(tapunits, unit, unit, 1,
---
> r = rman_reserve_resource(tapunits, unit, unit, 1,
415c415
< KASSERT(!(tp->tap_flags & TAP_OPEN),
---
> KASSERT(!(tp->tap_flags & TAP_OPEN),
424c424
< TAPDEBUG("%s%d is open. minor = %#x\n",
---
> TAPDEBUG("%s%d is open. minor = %#x\n",
470c470
< bzero(ifa->ifa_addr,
---
> bzero(ifa->ifa_addr,
472c472
< bzero(ifa->ifa_dstaddr,
---
> bzero(ifa->ifa_dstaddr,
474c474
< bzero(ifa->ifa_netmask,
---
> bzero(ifa->ifa_netmask,
490,491c490,491
< KASSERT((error == 0),
< ("%s%d could not release unit", ifp->if_name, ifp->if_unit));
---
> KASSERT((error == 0),
> ("%s%d could not release unit", ifp->if_name, ifp->if_unit));
494c494
< TAPDEBUG("%s%d is closed. minor = %#x\n",
---
> TAPDEBUG("%s%d is closed. minor = %#x\n",
534c534
< struct tap_softc *tp = (struct tap_softc *)(ifp->if_softc);
---
> struct tap_softc *tp = (struct tap_softc *)(ifp->if_softc);
567,568c567,568
< * tapifstart
< *
---
> * tapifstart
> *
585c585
< if (((tp->tap_flags & TAP_VMNET) == 0) &&
---
> if (((tp->tap_flags & TAP_VMNET) == 0) &&
589c589
< TAPDEBUG("%s%d not ready, tap_flags = 0x%x\n", ifp->if_name,
---
> TAPDEBUG("%s%d not ready, tap_flags = 0x%x\n", ifp->if_name,
640c640
< struct tapinfo *tapp = NULL;
---
> struct tapinfo *tapp = NULL;
645c645
< case TAPSIFINFO:
---
> case TAPSIFINFO:
647,650c647,650
< tapp = (struct tapinfo *)data;
< ifp->if_mtu = tapp->mtu;
< ifp->if_type = tapp->type;
< ifp->if_baudrate = tapp->baudrate;
---
> tapp = (struct tapinfo *)data;
> ifp->if_mtu = tapp->mtu;
> ifp->if_type = tapp->type;
> ifp->if_baudrate = tapp->baudrate;
652c652
< break;
---
> break;
654,659c654,659
< case TAPGIFINFO:
< tapp = (struct tapinfo *)data;
< tapp->mtu = ifp->if_mtu;
< tapp->type = ifp->if_type;
< tapp->baudrate = ifp->if_baudrate;
< break;
---
> case TAPGIFINFO:
> tapp = (struct tapinfo *)data;
> tapp->mtu = ifp->if_mtu;
> tapp->type = ifp->if_type;
> tapp->baudrate = ifp->if_baudrate;
> break;
759c759
< TAPDEBUG("%s%d reading, minor = %#x\n",
---
> TAPDEBUG("%s%d reading, minor = %#x\n",
780c780
<
---
>
802c802
< TAPDEBUG("%s%d dropping mbuf, minor = %#x\n", ifp->if_name,
---
> TAPDEBUG("%s%d dropping mbuf, minor = %#x\n", ifp->if_name,
825c825
< int error = 0, tlen, mlen;
---
> int error = 0, tlen, mlen;
827c827
< TAPDEBUG("%s%d writting, minor = %#x\n",
---
> TAPDEBUG("%s%d writting, minor = %#x\n",
872c872
<
---
>
896c896
< int s, revents = 0;
---
> int s, revents = 0;
898c898
< TAPDEBUG("%s%d polling, minor = %#x\n",
---
> TAPDEBUG("%s%d polling, minor = %#x\n",