diff options
author | glebius <glebius@FreeBSD.org> | 2014-09-18 10:01:56 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2014-09-18 10:01:56 +0000 |
commit | bf71125f67007cbce166cbf5bb6459ec0bbf5770 (patch) | |
tree | b1e18fbe026b3a8c5fb2b9c66b8bca796d8f44ab /sys | |
parent | f76e492f6dfbd579c3522f6e324fde5b1c468b40 (diff) | |
download | FreeBSD-src-bf71125f67007cbce166cbf5bb6459ec0bbf5770.zip FreeBSD-src-bf71125f67007cbce166cbf5bb6459ec0bbf5770.tar.gz |
While not too late rename if_get_counter_compat() to if_get_counter_default().
The compat counters will go away, but the function will remain in its place,
and in all places where it is going to be called.
Discussed with: melifaro
Diffstat (limited to 'sys')
-rw-r--r-- | sys/net/if.c | 4 | ||||
-rw-r--r-- | sys/net/if_var.h | 2 | ||||
-rw-r--r-- | sys/net/if_vlan.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 4dbe4eb..dfd30d3 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -616,7 +616,7 @@ if_attach_internal(struct ifnet *ifp, int vmove) } if (ifp->if_get_counter == NULL) - ifp->if_get_counter = if_get_counter_compat; + ifp->if_get_counter = if_get_counter_default; if (!vmove) { #ifdef MAC @@ -1389,7 +1389,7 @@ if_rtdel(struct radix_node *rn, void *arg) * Return counter values from old racy non-pcpu counters. */ uint64_t -if_get_counter_compat(struct ifnet *ifp, ifnet_counter cnt) +if_get_counter_default(struct ifnet *ifp, ifnet_counter cnt) { switch (cnt) { diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 9490631..0ec1322 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -527,7 +527,7 @@ typedef void if_com_free_t(void *com, u_char type); void if_register_com_alloc(u_char type, if_com_alloc_t *a, if_com_free_t *f); void if_deregister_com_alloc(u_char type); void if_data_copy(struct ifnet *, struct if_data *); -uint64_t if_get_counter_compat(struct ifnet *, ifnet_counter); +uint64_t if_get_counter_default(struct ifnet *, ifnet_counter); void if_inc_counter(struct ifnet *, ifnet_counter, int64_t); #define IF_LLADDR(ifp) \ diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 94a9ce0..3e45c66 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1152,7 +1152,7 @@ vlan_get_counter(struct ifnet *ifp, ifnet_counter cnt) case IFCOUNTER_OERRORS: return (counter_u64_fetch(ifv->ifv_oerrors)); default: - return (if_get_counter_compat(ifp, cnt)); + return (if_get_counter_default(ifp, cnt)); } /* NOTREACHED */ } |