summaryrefslogtreecommitdiffstats
path: root/sys/net/if_disc.c
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2004-06-22 20:13:25 +0000
committerbrooks <brooks@FreeBSD.org>2004-06-22 20:13:25 +0000
commite1dd867b5532da103ae1459a89ca3df2b8b6f0f6 (patch)
treebebe9375487f298832806df2423be9c48dba04e6 /sys/net/if_disc.c
parentdd32b92c2514b98b8c9d9af7ac82532d833c6db2 (diff)
downloadFreeBSD-src-e1dd867b5532da103ae1459a89ca3df2b8b6f0f6.zip
FreeBSD-src-e1dd867b5532da103ae1459a89ca3df2b8b6f0f6.tar.gz
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch]. - Locked struct if_clone. [1] - Add a per-cloner match function rather then simply matching names of the form <name><unit> and <name>. - Use the match function to allow creation of <interface>.<tag> vlan interfaces. The old way is preserved unchanged! - Also the match function to allow creation of stf(4) interfaces named stf0, stf, or 6to4. This is the only major user visible change in that "ifconfig stf" creates the interface stf rather then stf0 and does not print "stf0" to stdout. - Allow destroy functions to fail so they can refuse to delete interfaces. Currently, we forbid the deletion of interfaces which were created in the init function, particularly lo0, pflog0, and pfsync0. In the case of lo0 this was a panic implementation so it does not count as a user visiable change. :-) - Since most interfaces do not need the new functionality, an family of wrapper functions, ifc_simple_*(), were created to wrap old style cloner functions. - The IF_CLONE_INITIALIZER macro is replaced with a new incompatible IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE instead. Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1] Reviewed by: andre, mlaier Discussed on: net
Diffstat (limited to 'sys/net/if_disc.c')
-rw-r--r--sys/net/if_disc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index 1302c39..f8296dc 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -45,6 +45,7 @@
#include <sys/sockio.h>
#include <net/if.h>
+#include <net/if_clone.h>
#include <net/if_types.h>
#include <net/route.h>
#include <net/bpf.h>
@@ -75,8 +76,8 @@ static void disc_clone_destroy(struct ifnet *);
static struct mtx disc_mtx;
static MALLOC_DEFINE(M_DISC, DISCNAME, "Discard interface");
static LIST_HEAD(, disc_softc) disc_softc_list;
-static struct if_clone disc_cloner = IF_CLONE_INITIALIZER(DISCNAME,
- disc_clone_create, disc_clone_destroy, 0, IF_MAXUNIT);
+
+IFC_SIMPLE_DECLARE(disc, 0);
static int
disc_clone_create(struct if_clone *ifc, int unit)
OpenPOWER on IntegriCloud