svn commit: r364610 - stable/12/sys/netinet
Michael Tuexen
tuexen at FreeBSD.org
Mon Aug 24 08:01:10 UTC 2020
Author: tuexen
Date: Mon Aug 24 08:01:09 2020
New Revision: 364610
URL: https://svnweb.freebsd.org/changeset/base/364610
Log:
MFC r362155:
Remove usage of empty macro.
Modified:
stable/12/sys/netinet/sctp_os_bsd.h
stable/12/sys/netinet/sctp_pcb.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/netinet/sctp_os_bsd.h
==============================================================================
--- stable/12/sys/netinet/sctp_os_bsd.h Mon Aug 24 07:58:59 2020 (r364609)
+++ stable/12/sys/netinet/sctp_os_bsd.h Mon Aug 24 08:01:09 2020 (r364610)
@@ -315,11 +315,6 @@ typedef struct callout sctp_os_timer_t;
rt->rt_mtu = mtu; \
} while(0)
-/* (de-)register interface event notifications */
-#define SCTP_REGISTER_INTERFACE(ifhandle, af)
-#define SCTP_DEREGISTER_INTERFACE(ifhandle, af)
-
-
/*************************/
/* These are for logging */
/*************************/
Modified: stable/12/sys/netinet/sctp_pcb.c
==============================================================================
--- stable/12/sys/netinet/sctp_pcb.c Mon Aug 24 07:58:59 2020 (r364609)
+++ stable/12/sys/netinet/sctp_pcb.c Mon Aug 24 08:01:09 2020 (r364610)
@@ -299,8 +299,6 @@ sctp_delete_ifn(struct sctp_ifn *sctp_ifnp, int hold_a
SCTP_IPI_ADDR_WLOCK();
LIST_REMOVE(sctp_ifnp, next_bucket);
LIST_REMOVE(sctp_ifnp, next_ifn);
- SCTP_DEREGISTER_INTERFACE(sctp_ifnp->ifn_index,
- sctp_ifnp->registered_af);
if (hold_addr_lock == 0)
SCTP_IPI_ADDR_WUNLOCK();
/* Take away the reference, and possibly free it */
@@ -428,7 +426,6 @@ sctp_add_ifa_to_ifn(struct sctp_ifn *sctp_ifnp, struct
}
if (sctp_ifnp->ifa_count == 1) {
/* register the new interface */
- SCTP_REGISTER_INTERFACE(sctp_ifnp->ifn_index, ifa_af);
sctp_ifnp->registered_af = ifa_af;
}
}
@@ -469,13 +466,9 @@ sctp_remove_ifa_from_ifn(struct sctp_ifa *sctp_ifap)
/* re-register address family type, if needed */
if ((sctp_ifap->ifn_p->num_v6 == 0) &&
(sctp_ifap->ifn_p->registered_af == AF_INET6)) {
- SCTP_DEREGISTER_INTERFACE(sctp_ifap->ifn_p->ifn_index, AF_INET6);
- SCTP_REGISTER_INTERFACE(sctp_ifap->ifn_p->ifn_index, AF_INET);
sctp_ifap->ifn_p->registered_af = AF_INET;
} else if ((sctp_ifap->ifn_p->num_v4 == 0) &&
(sctp_ifap->ifn_p->registered_af == AF_INET)) {
- SCTP_DEREGISTER_INTERFACE(sctp_ifap->ifn_p->ifn_index, AF_INET);
- SCTP_REGISTER_INTERFACE(sctp_ifap->ifn_p->ifn_index, AF_INET6);
sctp_ifap->ifn_p->registered_af = AF_INET6;
}
/* free the ifn refcount */
@@ -676,7 +669,6 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint3
vrf->total_ifa_count++;
atomic_add_int(&SCTP_BASE_INFO(ipi_count_ifas), 1);
if (new_ifn_af) {
- SCTP_REGISTER_INTERFACE(ifn_index, new_ifn_af);
sctp_ifnp->registered_af = new_ifn_af;
}
SCTP_IPI_ADDR_WUNLOCK();
More information about the svn-src-all
mailing list