* New upstream SVN snapshot.

diff --git a/SNAPSHOT b/SNAPSHOT
index 81a7b4a3f087eda44ffc8e7c4e79629f5ebc851b..9fe4a885c00076fc4d3c264a1f50c4d93ef7e8cb 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: 4162
+Revision: 4165
 Last Changed Author: proski
-Last Changed Rev: 4162
-Last Changed Date: 2011-08-03 08:25:42 +0200 (Wed, 03 Aug 2011)
+Last Changed Rev: 4165
+Last Changed Date: 2011-08-15 21:10:12 +0200 (Mon, 15 Aug 2011)

diff --git a/contrib/madwifi.spec b/contrib/madwifi.spec
index 51c5c3eb2102b75ed4ebfc81e7858d999f549120..aaca04cdfbbdd11b84f691fe5065280c097c750e 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       4162
-%define       snapshot       20110804
+%define       revision       4165
+%define       snapshot       20110816
 # branch is not used yet.
 %define       branch         trunk
 Summary: A linux device driver for Atheros chipsets (ar5210, ar5211, ar5212).

diff --git a/debian/changelog b/debian/changelog
index 6634b942e08a6d2161a713bff03cff5eb01e90d5..f50f80e615f4a3c4e4f7afc4f765ff31adcf1026 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+madwifi (1:0.9.4+r4165.20110816-0.1) UNRELEASED; urgency=low
+
+  * NMU.
+  * New upstream SVN snapshot.
+
+ -- gregor herrmann <gregoa@debian.org>  Tue, 16 Aug 2011 18:06:12 +0200
+
 madwifi (1:0.9.4+r4162.20110804-0.1) experimental; urgency=low
 
   * NMU.

diff --git a/net80211/ieee80211_input.c b/net80211/ieee80211_input.c
index 07fc5fa8051c022529545a72dfcde5d8dad15382..90874ba1ff7cdcd7d6f878d9a69c102b5639f48d 100644 (file)
--- a/net80211/ieee80211_input.c
+++ b/net80211/ieee80211_input.c
@@ -29,7 +29,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_input.c 4139 2011-05-03 22:07:34Z proski $
+ * $Id: ieee80211_input.c 4165 2011-08-15 19:10:12Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -1133,10 +1133,12 @@ ieee80211_deliver_data(struct ieee80211_node *ni, struct sk_buff *skb)
 #else
                skb->protocol = eth_type_trans(skb, dev);
 #endif
+#if IEEE80211_VLAN_TAG_USED
                if (ni->ni_vlan != 0 && vap->iv_vlgrp != NULL) {
                        /* attach vlan tag */
                        vlan_hwaccel_receive_skb(skb, vap->iv_vlgrp, ni->ni_vlan);
                } else
+#endif
                        netif_rx(skb);
                dev->last_rx = jiffies;
        }

diff --git a/net80211/ieee80211_linux.h b/net80211/ieee80211_linux.h
index 89a4592afe02ff30f79080820a49222e2dbadfe1..a7e440fdb0d2df0b5ff2af5f43457638b9d30803 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 4139 2011-05-03 22:07:34Z proski $
+ * $Id: ieee80211_linux.h 4165 2011-08-15 19:10:12Z proski $
  */
 #ifndef _NET80211_IEEE80211_LINUX_H_
 #define _NET80211_IEEE80211_LINUX_H_
@@ -534,7 +534,8 @@ int ieee80211_proc_vcreate(struct ieee80211vap *, struct file_operations *,
               char *);
 void ieee80211_proc_cleanup(struct ieee80211vap *);
 
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0) && \
+    (defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE))
 #define IEEE80211_VLAN_TAG_USED 1
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20)