diff options
Diffstat (limited to 'sys/net/if.c')
| -rw-r--r-- | sys/net/if.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index f8d2fb1..e779e60 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -2008,7 +2008,7 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) error = priv_check(td, PRIV_NET_SETIFVNET); if (error) return (error); - error = vi_if_move(td, ifp, ifr->ifr_name, ifr->ifr_jid, NULL); + error = vi_if_move(td, ifp, ifr->ifr_name, ifr->ifr_jid); break; #endif @@ -2202,20 +2202,7 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct thread *td) error = priv_check(td, PRIV_NET_SETIFVNET); if (error) return (error); - return (vi_if_move(td, NULL, ifr->ifr_name, ifr->ifr_jid, - NULL)); - /* - * XXX vnet creation will be implemented through the new jail - * framework - this is just a temporary hack for testing the - * vnet create / destroy mechanisms. - */ - case SIOCSIFVIMAGE: - error = vi_if_move(td, NULL, NULL, 0, (struct vi_req *) data); - return (error); - case SIOCSPVIMAGE: - case SIOCGPVIMAGE: - error = vi_td_ioctl(cmd, (struct vi_req *) data, td); - return (error); + return (vi_if_move(td, NULL, ifr->ifr_name, ifr->ifr_jid)); #endif case SIOCIFCREATE: case SIOCIFCREATE2: |
