diff options
author | Gleb Smirnoff <glebius@FreeBSD.org> | 2013-11-01 10:18:41 +0000 |
---|---|---|
committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2013-11-01 10:18:41 +0000 |
commit | 237bf7f773ada301fdd99c23fef322bbd0e316ce (patch) | |
tree | c2256c6bf721a8fac8d61b0807a03a71bc132446 /sys/netinet | |
parent | 0d168b8d360753aa8e8619e5ff41e78d0caae1e8 (diff) | |
download | src-237bf7f773ada301fdd99c23fef322bbd0e316ce.tar.gz src-237bf7f773ada301fdd99c23fef322bbd0e316ce.zip |
Cleanup in_ifscrub(), which is just an entry to in_scrubprefix().
Notes
Notes:
svn path=/head/; revision=257499
Diffstat (limited to 'sys/netinet')
-rw-r--r-- | sys/netinet/if_ether.c | 2 | ||||
-rw-r--r-- | sys/netinet/in.c | 18 | ||||
-rw-r--r-- | sys/netinet/in_var.h | 1 | ||||
-rw-r--r-- | sys/netinet/raw_ip.c | 4 |
4 files changed, 7 insertions, 18 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 73ad03798acf..57fc09d8eac2 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -142,7 +142,7 @@ static const struct netisr_handler arp_nh = { #ifdef AF_INET /* - * called by in_ifscrub to remove entry from the table when + * called by in_scrubprefix() to remove entry from the table when * the interface goes away */ void diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 85d99eff465a..30f0273fd21b 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -488,7 +488,7 @@ in_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, * is the same as before, then the call is * un-necessarily executed here. */ - in_ifscrub(ifp, ia, LLE_STATIC); + in_scrubprefix(ia, LLE_STATIC); ia->ia_sockmask = ifra->ifra_mask; ia->ia_sockmask.sin_family = AF_INET; ia->ia_subnetmask = @@ -497,7 +497,7 @@ in_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, } if ((ifp->if_flags & IFF_POINTOPOINT) && (ifra->ifra_dstaddr.sin_family == AF_INET)) { - in_ifscrub(ifp, ia, LLE_STATIC); + in_scrubprefix(ia, LLE_STATIC); ia->ia_dstaddr = ifra->ifra_dstaddr; maskIsNew = 1; /* We lie; but the effect's the same */ } @@ -523,9 +523,9 @@ in_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, case SIOCDIFADDR: /* - * in_ifscrub kills the interface route. + * in_scrubprefix() kills the interface route. */ - in_ifscrub(ifp, ia, LLE_STATIC); + in_scrubprefix(ia, LLE_STATIC); /* * in_ifadown gets rid of all the rest of @@ -771,16 +771,6 @@ in_lifaddr_ioctl(struct socket *so, u_long cmd, caddr_t data, } /* - * Delete any existing route for an interface. - */ -void -in_ifscrub(struct ifnet *ifp, struct in_ifaddr *ia, u_int flags) -{ - - in_scrubprefix(ia, flags); -} - -/* * Initialize an interface's internet address * and routing table entry. */ diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h index b26a13d9ebd3..1a978e102e61 100644 --- a/sys/netinet/in_var.h +++ b/sys/netinet/in_var.h @@ -412,7 +412,6 @@ int in_addprefix(struct in_ifaddr *, int); int in_scrubprefix(struct in_ifaddr *, u_int); void ip_input(struct mbuf *); int in_ifadown(struct ifaddr *ifa, int); -void in_ifscrub(struct ifnet *, struct in_ifaddr *, u_int); struct mbuf *ip_fastforward(struct mbuf *); void *in_domifattach(struct ifnet *); void in_domifdetach(struct ifnet *, void *); diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 44bfab276ded..e3e79b5f6feb 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -736,9 +736,9 @@ rip_ctlinput(int cmd, struct sockaddr *sa, void *vip) ifa_ref(&ia->ia_ifa); IN_IFADDR_RUNLOCK(); /* - * in_ifscrub kills the interface route. + * in_scrubprefix() kills the interface route. */ - in_ifscrub(ia->ia_ifp, ia, 0); + in_scrubprefix(ia, 0); /* * in_ifadown gets rid of all the rest of the * routes. This is not quite the right thing |