Imported Upstream version 0.9.4+r4178.20120131

diff --git a/SNAPSHOT b/SNAPSHOT
index 1a6bd447c9b544880a28f9dd9e0f28371f6e0f95..3f76f874fe32a6dc15666a86b02204db20eeac37 100644 (file)
--- a/SNAPSHOT
+++ b/SNAPSHOT
@@ -2,7 +2,7 @@ Path: madwifi/branches/madwifi-0.9.4
 URL: http://svn.madwifi-project.org/madwifi/branches/madwifi-0.9.4
 Repository Root: http://svn.madwifi-project.org
 Repository UUID: 0192ed92-7a03-0410-a25b-9323aeb14dbd
-Revision: 4176
+Revision: 4178
 Last Changed Author: proski
-Last Changed Rev: 4176
-Last Changed Date: 2011-11-22 18:30:17 +0100 (Tue, 22 Nov 2011)
+Last Changed Rev: 4178
+Last Changed Date: 2012-01-30 20:56:17 +0100 (Mon, 30 Jan 2012)

diff --git a/contrib/madwifi.spec b/contrib/madwifi.spec
index 50b2e0411e054c2173a54a9d91199a7e55db5f10..4b575dafb7f8c4ae6397483e86339efc57d69c3d 100644 (file)
--- a/contrib/madwifi.spec
+++ b/contrib/madwifi.spec
@@ -10,8 +10,8 @@
 %define       mykrelver         %(echo %{mykversion} | tr -s '-' '_')
 # Define based on the tar ball extract.
 # Those two variable will be instanced during the tarball generation
-%define       revision       4176
-%define       snapshot       20111123
+%define       revision       4178
+%define       snapshot       20120131
 # branch is not used yet.
 %define       branch         trunk
 Summary: A linux device driver for Atheros chipsets (ar5210, ar5211, ar5212).

diff --git a/net80211/ieee80211_linux.h b/net80211/ieee80211_linux.h
index a7e440fdb0d2df0b5ff2af5f43457638b9d30803..875c8639134f9698bfb9a123a39037825763bccb 100644 (file)
--- a/net80211/ieee80211_linux.h
+++ b/net80211/ieee80211_linux.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211_linux.h 4165 2011-08-15 19:10:12Z proski $
+ * $Id: ieee80211_linux.h 4178 2012-01-30 19:56:17Z proski $
  */
 #ifndef _NET80211_IEEE80211_LINUX_H_
 #define _NET80211_IEEE80211_LINUX_H_
@@ -566,8 +566,10 @@ int ieee80211_ioctl_create_vap(struct ieee80211com *, struct ifreq *,
        struct net_device *);
 int ieee80211_create_vap(struct ieee80211com *, char *, struct net_device *,
        int, int);
+#if IEEE80211_VLAN_TAG_USED
 void ieee80211_vlan_register(struct net_device *dev, struct vlan_group *grp);
 void ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid);
 void ieee80211_vlan_kill_vid(struct net_device *dev, unsigned short vid);
+#endif
 
 #endif /* _NET80211_IEEE80211_LINUX_H_ */