From fa91f845028358800c1a848b68fff7c7822ac6fb Mon Sep 17 00:00:00 2001
From: Randall Stewart <rrs@FreeBSD.org>
Date: Wed, 13 Feb 2019 14:57:59 +0000
Subject: [PATCH] This commit adds the missing release mechanism for the
 ratelimiting code. The two modules (lagg and vlan) did have allocation
 routines, and even though they are indirect (and vector down to the
 underlying interfaces) they both need to have a free routine (that also
 vectors down to the actual interface).

Sponsored by:	Netflix Inc.
Differential Revision:	https://reviews.freebsd.org/D19032
---
 sys/net/if_lagg.c | 9 +++++++++
 sys/net/if_vlan.c | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c
index 3bea2e95d69b..5b7c6eb0aca1 100644
--- a/sys/net/if_lagg.c
+++ b/sys/net/if_lagg.c
@@ -133,6 +133,7 @@ static int	lagg_ioctl(struct ifnet *, u_long, caddr_t);
 static int	lagg_snd_tag_alloc(struct ifnet *,
 		    union if_snd_tag_alloc_params *,
 		    struct m_snd_tag **);
+static void	lagg_snd_tag_free(struct m_snd_tag *);
 #endif
 static int	lagg_setmulti(struct lagg_port *);
 static int	lagg_clrmulti(struct lagg_port *);
@@ -514,6 +515,7 @@ lagg_clone_create(struct if_clone *ifc, int unit, caddr_t params)
 	ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST;
 #ifdef RATELIMIT
 	ifp->if_snd_tag_alloc = lagg_snd_tag_alloc;
+	ifp->if_snd_tag_free = lagg_snd_tag_free;
 #endif
 	ifp->if_capenable = ifp->if_capabilities = IFCAP_HWSTATS;
 
@@ -1568,6 +1570,13 @@ lagg_snd_tag_alloc(struct ifnet *ifp,
 	/* forward allocation request */
 	return (ifp->if_snd_tag_alloc(ifp, params, ppmt));
 }
+
+static void
+lagg_snd_tag_free(struct m_snd_tag *tag)
+{
+	tag->ifp->if_snd_tag_free(tag);
+}
+
 #endif
 
 static int
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 535ce8cf7dcb..cf8b4ff1790a 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -267,6 +267,7 @@ static	int vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t addr);
 #ifdef RATELIMIT
 static	int vlan_snd_tag_alloc(struct ifnet *,
     union if_snd_tag_alloc_params *, struct m_snd_tag **);
+static void vlan_snd_tag_free(struct m_snd_tag *);
 #endif
 static	void vlan_qflush(struct ifnet *ifp);
 static	int vlan_setflag(struct ifnet *ifp, int flag, int status,
@@ -1047,6 +1048,7 @@ vlan_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params)
 	ifp->if_ioctl = vlan_ioctl;
 #ifdef RATELIMIT
 	ifp->if_snd_tag_alloc = vlan_snd_tag_alloc;
+	ifp->if_snd_tag_free = vlan_snd_tag_free;
 #endif
 	ifp->if_flags = VLAN_IFFLAGS;
 	ether_ifattach(ifp, eaddr);
@@ -1934,4 +1936,10 @@ vlan_snd_tag_alloc(struct ifnet *ifp,
 	/* forward allocation request */
 	return (ifp->if_snd_tag_alloc(ifp, params, ppmt));
 }
+
+static void
+vlan_snd_tag_free(struct m_snd_tag *tag)
+{
+	tag->ifp->if_snd_tag_free(tag);
+}
 #endif