From 540b1a7238d2a19d873f4b26fd87284b6cc29990 Mon Sep 17 00:00:00 2001 From: Gleb Smirnoff Date: Wed, 11 Sep 2013 09:19:44 +0000 Subject: [PATCH] Clean up SIOCSIFDSTADDR usage from ifnet drivers. The ioctl itself is extremely outdated, and I doubt that it was ever used for ifnet drivers. It was used for AF_INET sockets in pre-FreeBSD time. Approved by: re (hrs) Sponsored by: Nginx, Inc. --- sys/dev/iicbus/if_ic.c | 1 - sys/dev/lmc/if_lmc.c | 1 - sys/dev/ppbus/if_plip.c | 1 - sys/dev/usb/net/if_usie.c | 1 - sys/dev/usb/net/uhso.c | 1 - sys/net/if_gif.c | 3 --- sys/net/if_gre.c | 2 -- sys/net/if_spppsubr.c | 1 - sys/net/if_tun.c | 4 ---- 9 files changed, 15 deletions(-) diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c index 6579663d956..530cf648e7a 100644 --- a/sys/dev/iicbus/if_ic.c +++ b/sys/dev/iicbus/if_ic.c @@ -204,7 +204,6 @@ icioctl(struct ifnet *ifp, u_long cmd, caddr_t data) switch (cmd) { - case SIOCSIFDSTADDR: case SIOCAIFADDR: case SIOCSIFADDR: if (ifa->ifa_addr->sa_family != AF_INET) diff --git a/sys/dev/lmc/if_lmc.c b/sys/dev/lmc/if_lmc.c index 49d0a5009c6..d42aca1de3a 100644 --- a/sys/dev/lmc/if_lmc.c +++ b/sys/dev/lmc/if_lmc.c @@ -4480,7 +4480,6 @@ lmc_raw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) # if (defined(__FreeBSD__) && defined(DEVICE_POLLING)) /* XXX necessary? */ case SIOCSIFCAP: # endif - case SIOCSIFDSTADDR: case SIOCAIFADDR: case SIOCSIFFLAGS: #if 0 diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c index ceb4bce4250..60fc2128392 100644 --- a/sys/dev/ppbus/if_plip.c +++ b/sys/dev/ppbus/if_plip.c @@ -410,7 +410,6 @@ lpioctl(struct ifnet *ifp, u_long cmd, caddr_t data) int error; switch (cmd) { - case SIOCSIFDSTADDR: case SIOCAIFADDR: case SIOCSIFADDR: if (ifa->ifa_addr->sa_family != AF_INET) diff --git a/sys/dev/usb/net/if_usie.c b/sys/dev/usb/net/if_usie.c index 67f23b49232..9ca1ad61901 100644 --- a/sys/dev/usb/net/if_usie.c +++ b/sys/dev/usb/net/if_usie.c @@ -1324,7 +1324,6 @@ usie_if_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; case SIOCSIFADDR: - case SIOCSIFDSTADDR: break; default: diff --git a/sys/dev/usb/net/uhso.c b/sys/dev/usb/net/uhso.c index c56e1641cb3..c9d97577d2b 100644 --- a/sys/dev/usb/net/uhso.c +++ b/sys/dev/usb/net/uhso.c @@ -1854,7 +1854,6 @@ uhso_if_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) } break; case SIOCSIFADDR: - case SIOCSIFDSTADDR: case SIOCADDMULTI: case SIOCDELMULTI: break; diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index 874bbc00480..dfc2697e9af 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -687,9 +687,6 @@ gif_ioctl(ifp, cmd, data) ifp->if_flags |= IFF_UP; break; - case SIOCSIFDSTADDR: - break; - case SIOCADDMULTI: case SIOCDELMULTI: break; diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index df0fc8224bb..98090e54859 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -534,8 +534,6 @@ gre_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) case SIOCSIFADDR: ifp->if_flags |= IFF_UP; break; - case SIOCSIFDSTADDR: - break; case SIOCSIFFLAGS: /* * XXXRW: Isn't this priv_check() redundant to the ifnet diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index 72555459cd3..9fe713c3891 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -1200,7 +1200,6 @@ sppp_ioctl(struct ifnet *ifp, IOCTL_CMD_T cmd, void *data) rv = 0; switch (cmd) { case SIOCAIFADDR: - case SIOCSIFDSTADDR: break; case SIOCSIFADDR: diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index e67b213e636..f44bc0e5bf3 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -552,10 +552,6 @@ tunifioctl(struct ifnet *ifp, u_long cmd, caddr_t data) tuninit(ifp); TUNDEBUG(ifp, "address set\n"); break; - case SIOCSIFDSTADDR: - tuninit(ifp); - TUNDEBUG(ifp, "destination address set\n"); - break; case SIOCSIFMTU: ifp->if_mtu = ifr->ifr_mtu; TUNDEBUG(ifp, "mtu set\n");