Ticket #907: madwifi-refcnt-push-r2115.diff

b/ath/if_ath.c

@@ -1153 +1153 @@
-        }
-        if (sc->sc_hastsfadd)
-                ath_hal_settsfadjust(sc->sc_ah, sc->sc_stagbeacons);
-mdev->class_dev.dev
+ATH_GET_NETDEV_DEV(mdev)
-        /* complete setup */
-        (void) ieee80211_vap_attach(vap,
-                ieee80211_media_change, ieee80211_media_status);
@@ -1326 +1326 @@
-        ath_init(dev);
-}
-
-void
-ath_shutdown(struct net_device *dev)
-{
-        struct ath_softc *sc = dev->priv;
-
-        DPRINTF(sc, ATH_DEBUG_ANY, "%s: flags %x\n", __func__, dev->flags);
-        ath_stop(dev);
-}
-
-static void
-ath_uapsd_processtriggers(struct ath_softc *sc)
-{

b/ath/if_athvar.h

@@ -110 +110 @@
-#define SET_NETDEV_DEV(ndev, pdev)
-#endif
-
+#ifdef to_net_dev
+#define ATH_GET_NETDEV_DEV(ndev)        ((ndev)->dev.parent)
+#else
+#define ATH_GET_NETDEV_DEV(ndev)        ((ndev)->class_dev.dev)
+#endif
+
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23)
-static inline struct net_device *_alloc_netdev(int sizeof_priv, const char *mask,
-                                               void (*setup)(struct net_device *))
@@ -725 +731 @@
-int ath_detach(struct net_device *);
-void ath_resume(struct net_device *);
-void ath_suspend(struct net_device *);
-void ath_shutdown(struct net_device *);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-irqreturn_t ath_intr(int, void *);
-#else

b/include/compat.h

@@ -78 +78 @@
-#define isset(a,i)      ((a)[(i)/NBBY] & (1<<((i)%NBBY)))
-#define isclr(a,i)      (((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
-
+#ifndef __packed
-#define __packed        __attribute__((__packed__))
+#endif
+
-#define __printflike(_a,_b) \
-        __attribute__ ((__format__ (__printf__, _a, _b)))
-#define __offsetof(t,m) offsetof(t,m)

b/net80211/ieee80211.c

@@ -504 +504 @@
-        vap->iv_dtim_period = IEEE80211_DTIM_DEFAULT;
-        vap->iv_des_chan = IEEE80211_CHAN_ANYC; /* any channel is ok */
-
+        vap->iv_monitor_crc_errors = 0;
+        vap->iv_monitor_phy_errors = 0;
+
-        IEEE80211_ADDR_COPY(vap->iv_myaddr, ic->ic_myaddr);
-        /* NB: defer setting dev_addr so driver can override */
-

b/net80211/ieee80211_crypto_ccmp.c

@@ -57 +57 @@
-
-#define AES_BLOCK_LEN 16
-
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+#define crypto_cipher_cast(c) (c)
+#endif
+
-struct ccmp_ctx {
-        struct ieee80211vap *cc_vap;    /* for diagnostics + statistics */
-        struct ieee80211com *cc_ic;
@@ -145 +149 @@
-                        return 0;
-                }
-                
-
+
+
-        }
-        return 1;
-}
@@ -300 +305 @@
-rijndael_encrypt(struct crypto_tfm *tfm, const void *src, void *dst)
-{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-tfm
+crypto_cipher_cast(tfm)
-#else
-        struct scatterlist sg_src;
-        struct scatterlist sg_dst;

b/net80211/ieee80211_wireless.c

@@ -2019 +2019 @@
-                        vap->iv_xrvap = ic->ic_vap_create(ic, name, vap->iv_unit,
-                                IEEE80211_M_HOSTAP,IEEE80211_VAP_XR |
-                                IEEE80211_CLONE_BSSID, dev);
+                        if (!vap->iv_xrvap)
+                                return;
-                        vap->iv_xrvap->iv_fragthreshold = IEEE80211_XR_FRAG_THRESHOLD;
-                        copy_des_ssid(vap->iv_xrvap, vap);
-                        vap->iv_xrvap->iv_des_mode = vap->iv_des_mode;

b/THANKS

@@ -119 +119 @@
-(listed in alphabetic order) who supported us with donations:
-
-* Compex Systems Pte Ltd, Singapore - http://www.compex.com.sg
-3
+two donations with a total of 7
-
-* Linux-Consulting, USA - http://www.linux-consulting.com
-  madwifi.org domain name, DNS server maintenance