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

Eliminate some unneeded code bits.

Browse Source
This commit is contained in:
Yaroslav Tykhiy 2005-10-06 15:05:55 +00:00
parent 570df2e4f2
commit a2d3802cd8
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sbin/ifconfig/ifvlan.c
View File

@ -67,7 +67,7 @@ vlan_status(int s)
{
struct vlanreq vreq;
bzero((char *)&vreq, sizeof(struct vlanreq));
bzero((char *)&vreq, sizeof(vreq));
ifr.ifr_data = (caddr_t)&vreq;
if (ioctl(s, SIOCGETVLAN, (caddr_t)&ifr) == -1)
@ -76,8 +76,6 @@ vlan_status(int s)
printf("\tvlan: %d parent interface: %s\n",
vreq.vlr_tag, vreq.vlr_parent[0] == '\0' ?
"<none>" : vreq.vlr_parent);
return;
}
static void
@ -108,20 +106,19 @@ setvlandev(const char *val, int d, int s, const struct afswtch *afp)
static void
unsetvlandev(const char *val, int d, int s, const struct afswtch *afp)
{
struct vlanreq vreq;
if (val != NULL)
warnx("argument to -vlandev is useless and hence deprecated");
bzero((char *)&vreq, sizeof(struct vlanreq));
ifr.ifr_data = (caddr_t)&vreq;
bzero((char *)&__vreq, sizeof(__vreq));
ifr.ifr_data = (caddr_t)&__vreq;
#if 0 /* this code will be of use when we can alter vlan or vlandev only */
if (ioctl(s, SIOCGETVLAN, (caddr_t)&ifr) == -1)
err(1, "SIOCGETVLAN");
bzero((char *)&vreq.vlr_parent, sizeof(vreq.vlr_parent));
vreq.vlr_tag = 0; /* XXX clear parent only (no kernel support now) */
bzero((char *)&__vreq.vlr_parent, sizeof(__vreq.vlr_parent));
__vreq.vlr_tag = 0; /* XXX clear parent only (no kernel support now) */
#endif
if (ioctl(s, SIOCSETVLAN, (caddr_t)&ifr) == -1)
err(1, "SIOCSETVLAN");
__have_dev = __have_tag = 0;