summaryrefslogtreecommitdiffstats
path: root/sys/net/if_vlan.c
diff options
context:
space:
mode:
authorhrs <hrs@FreeBSD.org>2014-10-02 05:56:17 +0000
committerhrs <hrs@FreeBSD.org>2014-10-02 05:56:17 +0000
commitd30b551ba7cfc56d3ab418a06ca583ab5aef7c2f (patch)
treef36e93d3343b2ca244988547d7da862e06c14853 /sys/net/if_vlan.c
parentf6b1385c0ec1569e54da065b0136c4bb74f549ca (diff)
downloadFreeBSD-src-d30b551ba7cfc56d3ab418a06ca583ab5aef7c2f.zip
FreeBSD-src-d30b551ba7cfc56d3ab418a06ca583ab5aef7c2f.tar.gz
Virtualize net.link.vlan.soft_pad.
Diffstat (limited to 'sys/net/if_vlan.c')
-rw-r--r--sys/net/if_vlan.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 926afa0..1be2888 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -148,9 +148,10 @@ static SYSCTL_NODE(_net_link, IFT_L2VLAN, vlan, CTLFLAG_RW, 0,
static SYSCTL_NODE(_net_link_vlan, PF_LINK, link, CTLFLAG_RW, 0,
"for consistency");
-static int soft_pad = 0;
-SYSCTL_INT(_net_link_vlan, OID_AUTO, soft_pad, CTLFLAG_RW, &soft_pad, 0,
- "pad short frames before tagging");
+static VNET_DEFINE(int, soft_pad);
+#define V_soft_pad VNET(soft_pad)
+SYSCTL_INT(_net_link_vlan, OID_AUTO, soft_pad, CTLFLAG_RW | CTLFLAG_VNET,
+ &VNET_NAME(soft_pad), 0, "pad short frames before tagging");
static const char vlanname[] = "vlan";
static MALLOC_DEFINE(M_VLAN, vlanname, "802.1Q Virtual LAN Interface");
@@ -1082,7 +1083,7 @@ vlan_transmit(struct ifnet *ifp, struct mbuf *m)
* devices that just discard such runts instead or mishandle
* them somehow.
*/
- if (soft_pad && p->if_type == IFT_ETHER) {
+ if (V_soft_pad && p->if_type == IFT_ETHER) {
static char pad[8]; /* just zeros */
int n;
OpenPOWER on IntegriCloud