Date: Tue, 3 Feb 2004 23:04:50 -0800 (PST) From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 46466 for review Message-ID: <200402040704.i1474okm043141@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=46466 Change 46466 by sam@sam_ebb on 2004/02/03 23:03:50 sync w/ madwifi Affected files ... .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_linux.c#2 edit .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_linux.h#2 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_linux.c#2 (text+ko) ==== @@ -28,6 +28,20 @@ #define EXPORT_SYMTAB #endif +/* + * IEEE 802.11 support (Linux-specific code) + */ +#include <linux/config.h> +#include <linux/version.h> +#include <linux/module.h> +#include <linux/init.h> +#include <linux/skbuff.h> +#include <linux/netdevice.h> +#include <linux/etherdevice.h> +#include <linux/if_vlan.h> + +#include "if_media.h" + #include <net80211/ieee80211_var.h> /* @@ -110,6 +124,33 @@ } EXPORT_SYMBOL(ieee80211_ioctl); +#if IEEE80211_VLAN_TAG_USED +/* + * VLAN support. + */ + +/* + * Register a vlan group. + */ +void +ieee80211_vlan_register(struct ieee80211com *ic, struct vlan_group *grp) +{ + ic->ic_vlgrp = grp; +} +EXPORT_SYMBOL(ieee80211_vlan_register); + +/* + * Kill (i.e. delete) a vlan identifier. + */ +void +ieee80211_vlan_kill_vid(struct ieee80211com *ic, unsigned short vid) +{ + if (ic->ic_vlgrp) + ic->ic_vlgrp->vlan_devices[vid] = NULL; +} +EXPORT_SYMBOL(ieee80211_vlan_kill_vid); +#endif /* IEEE80211_VLAN_TAG_USED */ + #ifdef CONFIG_PROC_FS #include <linux/proc_fs.h> #include <linux/ctype.h> ==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_linux.h#2 (text+ko) ==== @@ -29,19 +29,6 @@ #ifndef _NET80211_IEEE80211_LINUX_H_ #define _NET80211_IEEE80211_LINUX_H_ -#include <linux/config.h> -#include <linux/version.h> -#include <linux/module.h> -#include <linux/init.h> -#include <linux/skbuff.h> -#include <linux/netdevice.h> -#include <linux/etherdevice.h> -#include <linux/random.h> - -#include "if_llc.h" -#include "if_ethersubr.h" -#include "if_media.h" - /* * Locking definitions. */ @@ -132,6 +119,15 @@ extern void ieee80211_proc_remove(struct ieee80211com *); #endif /* CONFIG_PROC_FS */ +#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) +#define IEEE80211_VLAN_TAG_USED 1 + +extern void ieee80211_vlan_register(struct ieee80211com *, struct vlan_group*); +extern void ieee80211_vlan_kill_vid(struct ieee80211com *, unsigned short); +#else +#define IEEE80211_VLAN_TAG_USED 0 +#endif + #ifdef CONFIG_NET_WIRELESS struct iw_statistics; extern void ieee80211_iw_getstats(struct ieee80211com*, struct iw_statistics*);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200402040704.i1474okm043141>