brcm47xx: update bcma and ssb to master-2011-07-21

[openwrt.git] / package / madwifi / patches / 386-acl_crashfix.patch

diff --git a/package/madwifi/patches/386-acl_crashfix.patch b/package/madwifi/patches/386-acl_crashfix.patch
index 12f3273..04a1ec9 100644 (file)
--- a/package/madwifi/patches/386-acl_crashfix.patch
+++ b/package/madwifi/patches/386-acl_crashfix.patch
@@ -37,7 +37,7 @@ Signed-off-by: Sebastian Gottschall <brainslayer@dd-wrt.com>
        return NULL;
  }
  
-@@ -176,11 +183,11 @@ acl_add(struct ieee80211vap *vap, const 
+@@ -176,11 +183,11 @@ acl_add(struct ieee80211vap *vap, const
                return -ENOMEM;
        }
  
@@ -51,7 +51,7 @@ Signed-off-by: Sebastian Gottschall <brainslayer@dd-wrt.com>
                        FREE(new, M_80211_ACL);
                        IEEE80211_DPRINTF(vap, IEEE80211_MSG_ACL,
                                "ACL: add " MAC_FMT " failed, already present\n",
-@@ -191,7 +198,7 @@ acl_add(struct ieee80211vap *vap, const 
+@@ -191,7 +198,7 @@ acl_add(struct ieee80211vap *vap, const
        IEEE80211_ADDR_COPY(new->acl_macaddr, mac);
        TAILQ_INSERT_TAIL(&as->as_list, new, acl_list);
        LIST_INSERT_HEAD(&as->as_hash[hash], new, acl_hash);
@@ -88,7 +88,7 @@ Signed-off-by: Sebastian Gottschall <brainslayer@dd-wrt.com>
  }
 --- a/net80211/ieee80211_linux.h
 +++ b/net80211/ieee80211_linux.h
-@@ -311,16 +311,15 @@ typedef spinlock_t ieee80211_scan_lock_t
+@@ -319,16 +319,15 @@ typedef spinlock_t ieee80211_scan_lock_t
  typedef spinlock_t acl_lock_t;
  #define       ACL_LOCK_INIT(_as, _name)       spin_lock_init(&(_as)->as_lock)
  #define       ACL_LOCK_DESTROY(_as)