Page MenuHomeFreeBSD
Files F143758163

D50567.diff
No OneTemporary
Actions

D50567.diff
View Options

diff --git a/sys/net/if.c b/sys/net/if.c
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -2089,6 +2089,7 @@
int (*vlan_pcp_p)(struct ifnet *, uint16_t *);
int (*vlan_setcookie_p)(struct ifnet *, void *);
void *(*vlan_cookie_p)(struct ifnet *);
+void (*vlan_input_p)(struct ifnet *, struct mbuf *);
/*
* Handle a change in the interface link state. To avoid LORs
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -106,8 +106,6 @@
void (*ng_ether_attach_p)(struct ifnet *ifp);
void (*ng_ether_detach_p)(struct ifnet *ifp);
-void (*vlan_input_p)(struct ifnet *, struct mbuf *);
-
/* if_bridge(4) support */
void (*bridge_dn_p)(struct mbuf *, struct ifnet *);
bool (*bridge_same_p)(const void *, const void *);
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -888,15 +888,6 @@
return (ifp);
}
-/*
- * VLAN support can be loaded as a module. The only place in the
- * system that's intimately aware of this is ether_input. We hook
- * into this code through vlan_input_p which is defined there and
- * set here. No one else in the system should be aware of this so
- * we use an explicit reference here.
- */
-extern void (*vlan_input_p)(struct ifnet *, struct mbuf *);
-
/* For if_link_state_change() eyes only... */
extern void (*vlan_link_state_p)(struct ifnet *);
diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h
--- a/sys/net/if_vlan_var.h
+++ b/sys/net/if_vlan_var.h
@@ -168,6 +168,7 @@
extern int (*vlan_pcp_p)(struct ifnet *, uint16_t *);
extern int (*vlan_setcookie_p)(struct ifnet *, void *);
extern void *(*vlan_cookie_p)(struct ifnet *);
+extern void (*vlan_input_p)(struct ifnet *, struct mbuf *);
#include <sys/_eventhandler.h>

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 1, 11:26 AM (17 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28353984
Default Alt Text
D50567.diff (1 KB)

Event Timeline