Page MenuHomeFreeBSD
Files F98805988

D45822.id140424.diff
No OneTemporary
Actions

D45822.id140424.diff
View Options

diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c
--- a/sys/net/if_vxlan.c
+++ b/sys/net/if_vxlan.c
@@ -367,7 +367,7 @@
static int vxlan_input(struct vxlan_socket *, uint32_t, struct mbuf **,
const struct sockaddr *);
-static int vxlan_stats_alloc(struct vxlan_softc *);
+static void vxlan_stats_alloc(struct vxlan_softc *);
static void vxlan_stats_free(struct vxlan_softc *);
static void vxlan_set_default_config(struct vxlan_softc *);
static int vxlan_set_user_config(struct vxlan_softc *,
@@ -2923,27 +2923,14 @@
return (error);
}
-static int
+static void
vxlan_stats_alloc(struct vxlan_softc *sc)
{
struct vxlan_statistics *stats = &sc->vxl_stats;
stats->txcsum = counter_u64_alloc(M_WAITOK);
- if (stats->txcsum == NULL)
- goto failed;
-
stats->tso = counter_u64_alloc(M_WAITOK);
- if (stats->tso == NULL)
- goto failed;
-
stats->rxcsum = counter_u64_alloc(M_WAITOK);
- if (stats->rxcsum == NULL)
- goto failed;
-
- return (0);
-failed:
- vxlan_stats_free(sc);
- return (ENOMEM);
}
static void
@@ -2951,18 +2938,9 @@
{
struct vxlan_statistics *stats = &sc->vxl_stats;
- if (stats->txcsum != NULL) {
- counter_u64_free(stats->txcsum);
- stats->txcsum = NULL;
- }
- if (stats->tso != NULL) {
- counter_u64_free(stats->tso);
- stats->tso = NULL;
- }
- if (stats->rxcsum != NULL) {
- counter_u64_free(stats->rxcsum);
- stats->rxcsum = NULL;
- }
+ counter_u64_free(stats->txcsum);
+ counter_u64_free(stats->tso);
+ counter_u64_free(stats->rxcsum);
}
static void
@@ -3233,9 +3211,6 @@
sc->vxl_unit = ifd->unit;
sc->vxl_fibnum = curthread->td_proc->p_fibnum;
vxlan_set_default_config(sc);
- error = vxlan_stats_alloc(sc);
- if (error != 0)
- goto fail;
if (ifd->params != NULL) {
error = ifc_copyin(ifd, &vxlp, sizeof(vxlp));
@@ -3247,6 +3222,7 @@
goto fail;
}
+ vxlan_stats_alloc(sc);
ifp = if_alloc(IFT_ETHER);
sc->vxl_ifp = ifp;
rm_init(&sc->vxl_lock, "vxlanrm");

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 5, 8:01 PM (16 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13631230
Default Alt Text
D45822.id140424.diff (1 KB)

Event Timeline