New upstream snapshot.

diff --git a/SNAPSHOT b/SNAPSHOT
index 2a64b87dec30d535e4a51f94a6e24b32f15ef312..81a7b4a3f087eda44ffc8e7c4e79629f5ebc851b 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: 4149
+Revision: 4162
 Last Changed Author: proski
-Last Changed Rev: 4149
-Last Changed Date: 2011-07-06 18:23:13 +0200 (Wed, 06 Jul 2011)
+Last Changed Rev: 4162
+Last Changed Date: 2011-08-03 08:25:42 +0200 (Wed, 03 Aug 2011)

diff --git a/ath/if_ath.c b/ath/if_ath.c
index e571ed3bc18402f72680e78fcc460a65c7fce665..e313e4c9081d90df315a6fabe37ccdc418924ed3 100644 (file)
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: if_ath.c 4139 2011-05-03 22:07:34Z proski $
+ * $Id: if_ath.c 4162 2011-08-03 06:25:42Z proski $
  */
 
 /*
@@ -4723,12 +4723,11 @@ ath_descdma_setup(struct ath_softc *sc,
 
        /* allocate buffers */
        bsize = sizeof(struct ath_buf) * nbuf;
-       bf = kmalloc(bsize, GFP_KERNEL);
+       bf = kzalloc(bsize, GFP_KERNEL);
        if (bf == NULL) {
                error = -ENOMEM;                /* XXX different code */
                goto fail2;
        }
-       memset(bf, 0, bsize);
        dd->dd_bufptr = bf;
 
        STAILQ_INIT(head);
@@ -4837,10 +4836,9 @@ ath_node_alloc(struct ieee80211_node_table *nt,struct ieee80211vap *vap)
        const size_t space = sizeof(struct ath_node) + sc->sc_rc->arc_space;
        struct ath_node *an;
 
-       an = kmalloc(space, GFP_ATOMIC);
+       an = kzalloc(space, GFP_ATOMIC);
        if (an == NULL)
                return NULL;
-       memset(an, 0, space);
        an->an_decomp_index = INVALID_DECOMP_INDEX;
        an->an_avgrssi = ATH_RSSI_DUMMY_MARKER;
        an->an_halstats.ns_avgbrssi = ATH_RSSI_DUMMY_MARKER;
@@ -7398,7 +7396,7 @@ ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)
                         *     this is a DEAUTH message that was sent and the
                         *     node was timed out due to inactivity.
                         */
-                        ieee80211_free_node(ni); 
+                       ieee80211_free_node(ni);
                }
 
                bus_unmap_single(sc->sc_bdev, bf->bf_skbaddr, 
@@ -9702,7 +9700,7 @@ static const ctl_table ath_sysctl_template[] = {
          .proc_handler = ath_sysctl_halparam,
          .extra2       = (void *)ATH_INTMIT,
        },
-       { 0 }
+       { }
 };
 
 static void
@@ -9887,21 +9885,21 @@ static ctl_table ath_static_sysctls[] = {
          .extra2       = &maxint,
          .proc_handler = proc_dointvec_minmax
        },
-       { 0 }
+       { }
 };
 static ctl_table ath_ath_table[] = {
        { ATH_INIT_CTL_NAME(DEV_ATH)
          .procname     = "ath",
          .mode         = 0555,
          .child        = ath_static_sysctls
-       }, { 0 }
+       }, { }
 };
 static ctl_table ath_root_table[] = {
        { ATH_INIT_CTL_NAME(CTL_DEV)
          .procname     = "dev",
          .mode         = 0555,
          .child        = ath_ath_table
-       }, { 0 }
+       }, { }
 };
 static struct ctl_table_header *ath_sysctl_header;
 

diff --git a/ath/if_ath_pci.c b/ath/if_ath_pci.c
index b378c3bfc1ba9099f50bc73d258a008ef373ac0c..b16e04e74908ac71a6bda7e183a0c9b0093002cf 100644 (file)
--- a/ath/if_ath_pci.c
+++ b/ath/if_ath_pci.c
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: if_ath_pci.c 4136 2011-02-02 21:22:31Z proski $
+ * $Id: if_ath_pci.c 4162 2011-08-03 06:25:42Z proski $
  */
 #include "opt_ah.h"
 
@@ -112,7 +112,7 @@ static struct pci_device_id ath_pci_id_table[] __devinitdata = {
        { 0x168c, 0x001c, PCI_ANY_ID, PCI_ANY_ID }, /* PCI Express 5424 */
        { 0x168c, 0x001d, PCI_ANY_ID, PCI_ANY_ID }, /* PCI Express ???  */
        { 0x168c, 0x9013, PCI_ANY_ID, PCI_ANY_ID }, /* sonicwall */
-       { 0 }
+       { }
 };
 
 static u16 ath_devidmap[][2] = {

diff --git a/ath_hal/ah_os.c b/ath_hal/ah_os.c
index e2e739c41e8c4b85095002e9a041d6ff1e2d3502..35acdcfdb186aea41e6f6fe9da54b78ee88246c6 100644 (file)
--- a/ath_hal/ah_os.c
+++ b/ath_hal/ah_os.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: ah_os.c 4136 2011-02-02 21:22:31Z proski $
+ * $Id: ah_os.c 4162 2011-08-03 06:25:42Z proski $
  */
 #include "opt_ah.h"
 
@@ -486,28 +486,28 @@ static ctl_table ath_hal_sysctls[] = {
          .proc_handler = proc_dointvec
        },
 #endif
-       { 0 }
+       { }
 };
 static ctl_table ath_hal_table[] = {
        { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "hal",
          .mode         = 0555,
          .child        = ath_hal_sysctls
-       }, { 0 }
+       }, { }
 };
 static ctl_table ath_ath_table[] = {
        { ATH_INIT_CTL_NAME(DEV_ATH)
          .procname     = "ath",
          .mode         = 0555,
          .child        = ath_hal_table
-       }, { 0 }
+       }, { }
 };
 static ctl_table ath_root_table[] = {
        { ATH_INIT_CTL_NAME(CTL_DEV)
          .procname     = "dev",
          .mode         = 0555,
          .child        = ath_ath_table
-       }, { 0 }
+       }, { }
 };
 static struct ctl_table_header *ath_hal_sysctl_header;
 

diff --git a/ath_rate/amrr/amrr.c b/ath_rate/amrr/amrr.c
index e7f65b87ea2d7b7c6e6ccd8fbf076e090dba919d..f317e03d831b05af6a2adecdec022dce38c53936 100644 (file)
--- a/ath_rate/amrr/amrr.c
+++ b/ath_rate/amrr/amrr.c
@@ -34,7 +34,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: amrr.c 4136 2011-02-02 21:22:31Z proski $
+ * $Id: amrr.c 4162 2011-08-03 06:25:42Z proski $
  */
 
 /*
@@ -524,28 +524,28 @@ static ctl_table ath_rate_static_sysctls[] = {
          .extra2       = &maxint,
          .proc_handler = proc_dointvec_minmax
        },
-       { 0 }
+       { }
 };
 static ctl_table ath_rate_table[] = {
        { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "rate",
          .mode         = 0555,
          .child        = ath_rate_static_sysctls
-       }, { 0 }
+       }, { }
 };
 static ctl_table ath_ath_table[] = {
        { ATH_INIT_CTL_NAME(DEV_ATH)
          .procname     = "ath",
          .mode         = 0555,
          .child        = ath_rate_table
-       }, { 0 }
+       }, { }
 };
 static ctl_table ath_root_table[] = {
        { ATH_INIT_CTL_NAME(CTL_DEV)
          .procname     = "dev",
          .mode         = 0555,
          .child        = ath_ath_table
-       }, { 0 }
+       }, { }
 };
 static struct ctl_table_header *ath_sysctl_header;
 

diff --git a/ath_rate/onoe/onoe.c b/ath_rate/onoe/onoe.c
index f384b6637a051ced7974dd730afeeda264ec006b..a25c9999b1f5331a0cfec8e603afc41652e58dc3 100644 (file)
--- a/ath_rate/onoe/onoe.c
+++ b/ath_rate/onoe/onoe.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: onoe.c 4136 2011-02-02 21:22:31Z proski $
+ * $Id: onoe.c 4162 2011-08-03 06:25:42Z proski $
  */
 
 /*
@@ -469,28 +469,28 @@ static ctl_table ath_rate_static_sysctls[] = {
          .maxlen       = sizeof(ath_rate_raise_threshold),
          .proc_handler = proc_dointvec
        },
-       { 0 }
+       { }
 };
 static ctl_table ath_rate_table[] = {
        { ATH_INIT_CTL_NAME(CTL_AUTO)
          .procname     = "rate",
          .mode         = 0555,
          .child        = ath_rate_static_sysctls
-       }, { 0 }
+       }, { }
 };
 static ctl_table ath_ath_table[] = {
        { ATH_INIT_CTL_NAME(DEV_ATH)
          .procname     = "ath",
          .mode         = 0555,
          .child        = ath_rate_table
-       }, { 0 }
+       }, { }
 };
 static ctl_table ath_root_table[] = {
        { ATH_INIT_CTL_NAME(CTL_DEV)
          .procname     = "dev",
          .mode         = 0555,
          .child        = ath_ath_table
-       }, { 0 }
+       }, { }
 };
 static struct ctl_table_header *ath_sysctl_header;
 

diff --git a/contrib/madwifi.spec b/contrib/madwifi.spec
index 5353fec3d9cf9a19f2a2b14ca3dee1eb9bb072f0..51c5c3eb2102b75ed4ebfc81e7858d999f549120 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       4149
-%define       snapshot       20110707
+%define       revision       4162
+%define       snapshot       20110804
 # 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 46b45237a3fb14e6750f27847642a4bea9099cdb..12dcf03265826397b267dc90878ff62ff23637c7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,9 @@
-madwifi (1:0.9.4+r4149.20110707-0.1) UNRELEASED; urgency=low
-
-  IGNORE-VERSION: 1:0.9.4+r4149.20110707-0.1
+madwifi (1:0.9.4+r4162.20110804-0.1) UNRELEASED; urgency=low
 
   * NMU.
   * New upstream SVN snapshot.
 
- -- gregor herrmann <gregoa@debian.org>  Thu, 07 Jul 2011 18:15:45 +0200
+ -- gregor herrmann <gregoa@debian.org>  Thu, 04 Aug 2011 21:28:57 +0200
 
 madwifi (1:0.9.4+r4147.20110623-0.1) experimental; urgency=low
 

diff --git a/net80211/ieee80211_linux.c b/net80211/ieee80211_linux.c
index 132861e5ff745eb99400979a1aeba94e2211131e..64205b9cbf79c3fc84fe4eac6c0179dc46c66e2b 100644 (file)
--- a/net80211/ieee80211_linux.c
+++ b/net80211/ieee80211_linux.c
@@ -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.c 4136 2011-02-02 21:22:31Z proski $
+ * $Id: ieee80211_linux.c 4162 2011-08-03 06:25:42Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -659,7 +659,7 @@ static const ctl_table ieee80211_sysctl_template[] = {
          .mode         = 0444,
          .proc_handler = proc_dostring
        },
-       { 0 }
+       { }
 };
 
 void

diff --git a/net80211/ieee80211_wireless.c b/net80211/ieee80211_wireless.c
index a2cfe6f36a9e1e1bece1a0833a3aee35315c5b33..7bc6715c4b08d4daeebe4f5564e9820df482b96c 100644 (file)
--- a/net80211/ieee80211_wireless.c
+++ b/net80211/ieee80211_wireless.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: ieee80211_wireless.c 4139 2011-05-03 22:07:34Z proski $
+ * $Id: ieee80211_wireless.c 4156 2011-08-03 01:07:44Z proski $
  */
 
 /*
@@ -1236,31 +1236,30 @@ ieee80211_ioctl_siwpower(struct net_device *dev, struct iw_request_info *info,
 
        if ((ic->ic_caps & IEEE80211_C_PMGT) == 0)
                return -EOPNOTSUPP;
-       
+
        if (wrq->disabled) {
-               if (ic->ic_flags & IEEE80211_F_PMGTON)
-                       ic->ic_flags &= ~IEEE80211_F_PMGTON;
+               ic->ic_flags &= ~IEEE80211_F_PMGTON;
        } else {
-       switch (wrq->flags & IW_POWER_MODE) {
-       case IW_POWER_UNICAST_R:
-       case IW_POWER_ALL_R:
-       case IW_POWER_ON:
+               switch (wrq->flags & IW_POWER_MODE) {
+               case IW_POWER_UNICAST_R:
+               case IW_POWER_ALL_R:
+               case IW_POWER_ON:
                        if (wrq->flags & IW_POWER_PERIOD) {
                                if (IEEE80211_BINTVAL_VALID(wrq->value))
                                        ic->ic_lintval = IEEE80211_MS_TO_TU(wrq->value);
                                else
-               return -EINVAL;
-       }
+                                       return -EINVAL;
+                       }
                        if (wrq->flags & IW_POWER_TIMEOUT)
-               ic->ic_holdover = IEEE80211_MS_TO_TU(wrq->value);
-                       
-               ic->ic_flags |= IEEE80211_F_PMGTON;
+                               ic->ic_holdover = IEEE80211_MS_TO_TU(wrq->value);
+
+                       ic->ic_flags |= IEEE80211_F_PMGTON;
                        break;
                default:
                        return -EINVAL;
+               }
        }
-       }
-       
+
        return IS_UP(ic->ic_dev) ? ic->ic_reset(ic->ic_dev) : 0;
 }
 

diff --git a/net80211/if_media.c b/net80211/if_media.c
index 18b1b6702a1f6b334a28d29b81ec58bb45ec9a21..c9d5851a91f3aa52b03b32416ed0b962e24bc999 100644 (file)
--- a/net80211/if_media.c
+++ b/net80211/if_media.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_media.c 4136 2011-02-02 21:22:31Z proski $
+ * $Id: if_media.c 4159 2011-08-03 01:22:41Z proski $
  */
 
 /*
@@ -290,8 +290,8 @@ ifmedia_ioctl(struct net_device *dev, struct ifreq *ifr,
                        return (-EINVAL);
 
                if (ifmr->ifm_count != 0) {
-                       kptr = (int *)kmalloc(ifmr->ifm_count * sizeof(int),
-                           GFP_KERNEL);
+                       kptr = kmalloc(ifmr->ifm_count * sizeof(int),
+                                      GFP_KERNEL);
 
                        if (kptr == NULL)
                                return (-ENOMEM);