d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly name r_unit member tun_unit.

Browse Source 
Remove unused tun_wsel member.
This commit is contained in:
phk 2003-09-27 21:43:16 +00:00
parent 6a0cf06f6a
commit 8472808fa8
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/net/if_tun.c
View File

@ -273,7 +273,7 @@ tunopen(dev_t dev, int flag, int mode, struct thread *td)
tp = dev->si_drv1;
}
KASSERT(!(tp->tun_flags & TUN_OPEN), ("Resource & flags out-of-sync"));
tp->r_unit = r;
tp->tun_unit = r;
tp->tun_pid = td->td_proc->p_pid;
ifp = &tp->tun_if;
tp->tun_flags |= TUN_OPEN;
@ -297,7 +297,7 @@ tunclose(dev_t dev, int foo, int bar, struct thread *td)
tp = dev->si_drv1;
ifp = &tp->tun_if;
KASSERT(tp->r_unit, ("Unit %d not marked open", ifp->if_unit));
KASSERT(tp->tun_unit, ("Unit %d not marked open", ifp->if_unit));
tp->tun_flags &= ~TUN_OPEN;
tp->tun_pid = 0;
@ -329,7 +329,7 @@ tunclose(dev_t dev, int foo, int bar, struct thread *td)
selwakeup(&tp->tun_rsel);
TUNDEBUG ("%s%d: closed\n", ifp->if_name, ifp->if_unit);
err = rman_release_resource(tp->r_unit);
err = rman_release_resource(tp->tun_unit);
KASSERT(err == 0, ("Unit %d failed to release", ifp->if_unit));
return (0);

3
sys/net/if_tunvar.h
View File

@ -47,10 +47,9 @@ struct tun_softc {
struct ifnet tun_if; /* the interface */
struct sigio *tun_sigio; /* information for async I/O */
struct selinfo tun_rsel; /* read select */
struct selinfo tun_wsel; /* write select (not used) */
struct tun_softc *next; /* Next softc in list */
struct resource *r_unit; /* resource allocated for this unit */
struct resource *tun_unit; /* resource allocated for this unit */
};
#endif /* !_NET_IF_TUNVAR_H_ */