SOURCES: madwifi-ng-2.6.29.patch (NEW) - patch for .29
zbyniu
zbyniu at pld-linux.org
Thu Apr 9 00:16:29 CEST 2009
Author: zbyniu Date: Wed Apr 8 22:16:29 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- patch for .29
---- Files affected:
SOURCES:
madwifi-ng-2.6.29.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/madwifi-ng-2.6.29.patch
diff -u /dev/null SOURCES/madwifi-ng-2.6.29.patch:1.1
--- /dev/null Thu Apr 9 00:16:29 2009
+++ SOURCES/madwifi-ng-2.6.29.patch Thu Apr 9 00:16:23 2009
@@ -0,0 +1,2460 @@
+diff -upr madwifi-trunk-r3878-20081204./ath/if_ath.c madwifi-trunk-r3878-20081204/ath/if_ath.c
+--- madwifi-trunk-r3878-20081204./ath/if_ath.c 2009-04-08 21:10:30.810073296 +0000
++++ madwifi-trunk-r3878-20081204/ath/if_ath.c 2009-04-08 22:13:20.472196131 +0000
+@@ -475,7 +475,11 @@ MODULE_PARM_DESC(ieee80211_debug, "Load-
+ int
+ ath_attach(u_int16_t devid, struct net_device *dev, HAL_BUS_TAG tag)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ struct ieee80211com *ic = &sc->sc_ic;
+ struct ieee80211vap *vap;
+ struct ath_hal *ah;
+@@ -1127,7 +1131,11 @@ bad:
+ int
+ ath_detach(struct net_device *dev)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ struct ath_hal *ah = sc->sc_ah;
+
+ HAL_INT tmp;
+@@ -1191,7 +1199,11 @@ static struct ieee80211vap *
+ ath_vap_create(struct ieee80211com *ic, const char *name,
+ int opmode, int flags, struct net_device *mdev)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = ic->ic_dev->ml_priv;
++#else
+ struct ath_softc *sc = ic->ic_dev->priv;
++#endif
+ struct ath_hal *ah = sc->sc_ah;
+ struct net_device *dev;
+ struct ath_vap *avp;
+@@ -1266,7 +1278,11 @@ ath_vap_create(struct ieee80211com *ic,
+ return NULL;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ avp = dev->ml_priv;
++#else
+ avp = dev->priv;
++#endif
+ ieee80211_vap_setup(ic, dev, name, opmode, flags);
+ /* override with driver methods */
+ vap = &avp->av_vap;
+@@ -1450,7 +1466,11 @@ static void
+ ath_vap_delete(struct ieee80211vap *vap)
+ {
+ struct net_device *dev = vap->iv_ic->ic_dev;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ struct ath_hal *ah = sc->sc_ah;
+ struct ath_vap *avp = ATH_VAP(vap);
+ int decrease = 1;
+@@ -1550,14 +1570,22 @@ ath_vap_delete(struct ieee80211vap *vap)
+ void
+ ath_suspend(struct net_device *dev)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ DPRINTF(((struct ath_softc *)dev->ml_priv), ATH_DEBUG_ANY, "flags=%x\n", dev->flags);
++#else
+ DPRINTF(((struct ath_softc *)dev->priv), ATH_DEBUG_ANY, "flags=%x\n", dev->flags);
++#endif
+ ath_stop(dev);
+ }
+
+ void
+ ath_resume(struct net_device *dev)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ DPRINTF(((struct ath_softc *)dev->ml_priv), ATH_DEBUG_ANY, "flags=%x\n", dev->flags);
++#else
+ DPRINTF(((struct ath_softc *)dev->priv), ATH_DEBUG_ANY, "flags=%x\n", dev->flags);
++#endif
+ ath_init(dev);
+ }
+
+@@ -2312,7 +2340,11 @@ ath_intr(int irq, void *dev_id, struct p
+ #endif
+ {
+ struct net_device *dev = dev_id;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ struct ath_hal *ah = sc->sc_ah;
+ u_int64_t hw_tsf = 0;
+ HAL_INT status;
+@@ -2508,7 +2540,11 @@ static void
+ ath_fatal_tasklet(TQUEUE_ARG data)
+ {
+ struct net_device *dev = (struct net_device *)data;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+
+ EPRINTF(sc, "Hardware error; resetting.\n");
+ ath_reset(dev);
+@@ -2518,7 +2554,11 @@ static void
+ ath_rxorn_tasklet(TQUEUE_ARG data)
+ {
+ struct net_device *dev = (struct net_device *)data;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+
+ EPRINTF(sc, "Receive FIFO overrun; resetting.\n");
+ ath_reset(dev);
+@@ -2528,7 +2568,11 @@ static void
+ ath_bmiss_tasklet(TQUEUE_ARG data)
+ {
+ struct net_device *dev = (struct net_device *)data;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+
+ if (time_before(jiffies, sc->sc_ic.ic_bmiss_guard)) {
+ /* Beacon miss interrupt occured too short after last beacon
+@@ -2570,7 +2614,11 @@ ath_chan2flags(struct ieee80211_channel
+ static int
+ ath_init(struct net_device *dev)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ struct ieee80211com *ic = &sc->sc_ic;
+ struct ath_hal *ah = sc->sc_ah;
+ HAL_STATUS status;
+@@ -2673,7 +2721,11 @@ done:
+ static int
+ ath_stop_locked(struct net_device *dev)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ struct ieee80211com *ic = &sc->sc_ic;
+ struct ath_hal *ah = sc->sc_ah;
+
+@@ -2754,7 +2806,11 @@ static void ath_set_beacon_cal(struct at
+ static int
+ ath_stop(struct net_device *dev)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ int error;
+
+ ATH_LOCK(sc);
+@@ -2794,7 +2850,11 @@ ath_stop(struct net_device *dev)
+ static int
+ ath_reset(struct net_device *dev)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ struct ieee80211com *ic = &sc->sc_ic;
+ struct ath_hal *ah = sc->sc_ah;
+ struct ieee80211_channel *c;
+@@ -2999,7 +3059,11 @@ dot11_to_ratecode(struct ath_softc *sc,
+ static int
+ ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ struct ieee80211com *ic = &sc->sc_ic;
+ struct ath_hal *ah = sc->sc_ah;
+ struct ieee80211_phy_params *ph = &(SKB_CB(skb)->phy);
+@@ -3315,7 +3379,11 @@ _take_txbuf(struct ath_softc *sc, int fo
+ static int
+ ath_hardstart(struct sk_buff *__skb, struct net_device *dev)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ struct ieee80211_node *ni = NULL;
+ struct ath_buf *bf = NULL;
+ struct ether_header *eh;
+@@ -3662,7 +3730,11 @@ static int
+ ath_mgtstart(struct ieee80211com *ic, struct sk_buff *skb)
+ {
+ struct net_device *dev = ic->ic_dev;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ struct ath_buf *bf = NULL;
+ int error;
+
+@@ -3994,7 +4066,11 @@ static ieee80211_keyix_t
+ ath_key_alloc(struct ieee80211vap *vap, const struct ieee80211_key *k)
+ {
+ struct net_device *dev = vap->iv_ic->ic_dev;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+
+ /*
+ * Group key allocation must be handled specially for
+@@ -4059,7 +4135,11 @@ ath_key_delete(struct ieee80211vap *vap,
+ struct ieee80211_node *ninfo)
+ {
+ struct net_device *dev = vap->iv_ic->ic_dev;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ struct ath_hal *ah = sc->sc_ah;
+ struct ieee80211_node *ni = NULL;
+ const struct ieee80211_cipher *cip = k->wk_cipher;
+@@ -4135,7 +4215,11 @@ ath_key_set(struct ieee80211vap *vap, co
+ const u_int8_t mac[IEEE80211_ADDR_LEN])
+ {
+ struct net_device *dev = vap->iv_ic->ic_dev;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+
+ return ath_keyset(sc, k, mac, vap->iv_bss);
+ }
+@@ -4150,7 +4234,11 @@ static void
+ ath_key_update_begin(struct ieee80211vap *vap)
+ {
+ struct net_device *dev = vap->iv_ic->ic_dev;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+
+ DPRINTF(sc, ATH_DEBUG_KEYCACHE, "Begin\n");
+ /*
+@@ -4171,7 +4259,11 @@ static void
+ ath_key_update_end(struct ieee80211vap *vap)
+ {
+ struct net_device *dev = vap->iv_ic->ic_dev;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+
+ DPRINTF(sc, ATH_DEBUG_KEYCACHE, "End\n");
+ netif_wake_queue(dev);
+@@ -4261,7 +4353,11 @@ ath_merge_mcast(struct ath_softc *sc, u_
+ static void
+ ath_mode_init(struct net_device *dev)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ struct ath_hal *ah = sc->sc_ah;
+ u_int32_t rfilt, mfilt[2];
+
+@@ -4455,7 +4551,11 @@ ath_setctstimeout(struct ath_softc *sc)
+ static void
+ ath_updateslot(struct net_device *dev)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ struct ieee80211com *ic = &sc->sc_ic;
+
+ /*
+@@ -4482,7 +4582,11 @@ static void
+ ath_beacon_dturbo_config(struct ieee80211vap *vap, u_int32_t intval)
+ {
+ struct ieee80211com *ic = vap->iv_ic;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = ic->ic_dev->ml_priv;
++#else
+ struct ath_softc *sc = ic->ic_dev->priv;
++#endif
+
+ /* Check VAP capability. */
+ if ((ic->ic_opmode == IEEE80211_M_HOSTAP) && vap->iv_bss &&
+@@ -4531,7 +4635,11 @@ static void
+ ath_beacon_dturbo_update(struct ieee80211vap *vap, int *needmark, u_int8_t dtim)
+ {
+ struct ieee80211com *ic = vap->iv_ic;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = ic->ic_dev->ml_priv;
++#else
+ struct ath_softc *sc = ic->ic_dev->priv;
++#endif
+ u_int32_t bss_traffic;
+
+ if (sc->sc_ignore_ar) {
+@@ -4674,7 +4782,11 @@ static void
+ ath_turbo_switch_mode(unsigned long data)
+ {
+ struct net_device *dev = (struct net_device *)data;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ struct ieee80211com *ic = &sc->sc_ic;
+ unsigned int newflags;
+
+@@ -5388,7 +5500,11 @@ static void
+ ath_bstuck_tasklet(TQUEUE_ARG data)
+ {
+ struct net_device *dev = (struct net_device *)data;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ /*
+ * XXX:if the bmisscount is cleared while the
+ * tasklet execution is pending, the following
+@@ -5813,7 +5929,11 @@ ath_desc_free(struct ath_softc *sc)
+ static struct ieee80211_node *
+ ath_node_alloc(struct ieee80211vap *vap)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = vap->iv_ic->ic_dev->ml_priv;
++#else
+ struct ath_softc *sc = vap->iv_ic->ic_dev->priv;
++#endif
+ const size_t space = sizeof(struct ath_node) + sc->sc_rc->arc_space;
+ struct ath_node *an = kzalloc(space, GFP_ATOMIC);
+ if (an != NULL) {
+@@ -5841,7 +5961,11 @@ static void
+ ath_node_cleanup(struct ieee80211_node *ni)
+ {
+ struct ieee80211com *ic = ni->ni_ic;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = ni->ni_ic->ic_dev->ml_priv;
++#else
+ struct ath_softc *sc = ni->ni_ic->ic_dev->priv;
++#endif
+ struct ath_node *an = ATH_NODE(ni);
+ struct ath_buf *bf;
+
+@@ -5926,7 +6050,11 @@ ath_node_move_data(const struct ieee8021
+ #ifdef NOT_YET
+ struct ath_txq *txq = NULL;
+ struct ieee80211com *ic = ni->ni_ic;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = ic->ic_dev->ml_priv;
++#else
+ struct ath_softc *sc = ic->ic_dev->priv;
++#endif
+ struct ath_buf *bf, *prev, *bf_tmp, *bf_tmp1;
+ struct ath_hal *ah = sc->sc_ah;
+ struct sk_buff *skb = NULL;
+@@ -6362,7 +6490,11 @@ static int
+ ath_recv_mgmt(struct ieee80211vap * vap, struct ieee80211_node *ni_or_null,
+ struct sk_buff *skb, int subtype, int rssi, u_int64_t rtsf)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = vap->iv_ic->ic_dev->ml_priv;
++#else
+ struct ath_softc *sc = vap->iv_ic->ic_dev->priv;
++#endif
+ struct ieee80211_node * ni = ni_or_null;
+ u_int64_t hw_tsf, beacon_tsf;
+ u_int32_t hw_tu, beacon_tu, intval;
+@@ -6493,7 +6625,11 @@ ath_rx_tasklet(TQUEUE_ARG data)
+ ((_pa) - (_sc)->sc_rxdma.dd_desc_paddr)))
+ struct net_device *dev = (struct net_device *)data;
+ struct ath_buf *bf;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ struct ieee80211com *ic = &sc->sc_ic;
+ struct ath_hal *ah = sc ? sc->sc_ah : NULL;
+ struct ath_desc *ds;
+@@ -6931,7 +7067,11 @@ static void ath_grppoll_start(struct iee
+ struct sk_buff *skb = NULL;
+ struct ath_buf *bf = NULL, *head = NULL;
+ struct ieee80211com *ic = vap->iv_ic;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = ic->ic_dev->ml_priv;
++#else
+ struct ath_softc *sc = ic->ic_dev->priv;
++#endif
+ struct ath_hal *ah = sc->sc_ah;
+ u_int8_t rate;
+ unsigned int ctsrate = 0, ctsduration = 0;
+@@ -7137,7 +7277,11 @@ static void ath_grppoll_start(struct iee
+ static void ath_grppoll_stop(struct ieee80211vap *vap)
+ {
+ struct ieee80211com *ic = vap->iv_ic;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = ic->ic_dev->ml_priv;
++#else
+ struct ath_softc *sc = ic->ic_dev->priv;
++#endif
+ struct ath_hal *ah = sc->sc_ah;
+ struct ath_txq *txq = &sc->sc_grpplq;
+ struct ath_buf *bf;
+@@ -7343,7 +7487,11 @@ ath_txq_update(struct ath_softc *sc, str
+ static int
+ ath_wme_update(struct ieee80211com *ic)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = ic->ic_dev->ml_priv;
++#else
+ struct ath_softc *sc = ic->ic_dev->priv;
++#endif
+
+ if (sc->sc_uapsdq)
+ ath_txq_update(sc, sc->sc_uapsdq, WME_AC_VO);
+@@ -7362,7 +7510,11 @@ ath_uapsd_flush(struct ieee80211_node *n
+ {
+ struct ath_node *an = ATH_NODE(ni);
+ struct ath_buf *bf;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = ni->ni_ic->ic_dev->ml_priv;
++#else
+ struct ath_softc *sc = ni->ni_ic->ic_dev->priv;
++#endif
+ struct ath_txq *txq;
+
+ ATH_NODE_UAPSD_LOCK_IRQ(an);
+@@ -7535,7 +7687,11 @@ static int
+ ath_tx_start(struct net_device *dev, struct ieee80211_node *ni,
+ struct ath_buf *bf, struct sk_buff *skb, int nextfraglen)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ struct ieee80211com *ic = ni->ni_ic;
+ struct ieee80211vap *vap = ni->ni_vap;
+ struct ath_hal *ah = sc->sc_ah;
+@@ -8384,7 +8540,11 @@ static void
+ ath_tx_tasklet_q0(TQUEUE_ARG data)
+ {
+ struct net_device *dev = (struct net_device *)data;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+
+ if (txqactive(sc->sc_ah, 0))
+ ath_tx_processq(sc, &sc->sc_txq[0]);
+@@ -8405,7 +8565,11 @@ static void
+ ath_tx_tasklet_q0123(TQUEUE_ARG data)
+ {
+ struct net_device *dev = (struct net_device *)data;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+
+ /*
+ * Process each active queue.
+@@ -8449,7 +8613,11 @@ static void
+ ath_tx_tasklet(TQUEUE_ARG data)
+ {
+ struct net_device *dev = (struct net_device *)data;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ unsigned int i;
+
+ for (i = 0; i < HAL_NUM_TX_QUEUES; i++) {
+@@ -8482,7 +8650,11 @@ ath_tx_tasklet(TQUEUE_ARG data)
+ static void
+ ath_tx_timeout(struct net_device *dev)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ int i;
+
+ if (ath_chan_unavail(sc))
+@@ -8867,7 +9039,11 @@ static void
+ ath_calibrate(unsigned long arg)
+ {
+ struct net_device *dev = (struct net_device *)arg;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ struct ath_hal *ah = sc->sc_ah;
+ struct ieee80211com *ic = &sc->sc_ic;
+ /* u_int32_t nchans; */
+@@ -8947,7 +9123,11 @@ static void
+ ath_scan_start(struct ieee80211com *ic)
+ {
+ struct net_device *dev = ic->ic_dev;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ struct ath_hal *ah = sc->sc_ah;
+ u_int32_t rfilt;
+
+@@ -8967,7 +9147,11 @@ static void
+ ath_scan_end(struct ieee80211com *ic)
+ {
+ struct net_device *dev = ic->ic_dev;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+ struct ath_hal *ah = sc->sc_ah;
+ u_int32_t rfilt;
+
+@@ -8985,7 +9169,11 @@ static void
+ ath_set_channel(struct ieee80211com *ic)
+ {
+ struct net_device *dev = ic->ic_dev;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = dev->ml_priv;
++#else
+ struct ath_softc *sc = dev->priv;
++#endif
+
+ (void) ath_chan_set(sc, ic->ic_curchan);
+ /*
+@@ -9001,7 +9189,11 @@ ath_set_channel(struct ieee80211com *ic)
+ static void
+ ath_set_coverageclass(struct ieee80211com *ic)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = ic->ic_dev->ml_priv;
++#else
+ struct ath_softc *sc = ic->ic_dev->priv;
++#endif
+
+ ath_hal_setcoverageclass(sc->sc_ah, ic->ic_coverageclass, 0);
+
+@@ -9011,7 +9203,11 @@ ath_set_coverageclass(struct ieee80211co
+ static u_int
+ ath_mhz2ieee(struct ieee80211com *ic, u_int freq, u_int flags)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++ struct ath_softc *sc = ic->ic_dev->ml_priv;
++#else
+ struct ath_softc *sc = ic->ic_dev->priv;
++#endif
+
+ return (ath_hal_mhz2ieee(sc->sc_ah, freq, flags));
+ }
+@@ -9026,7 +9222,11 @@ ath_newstate(struct ieee80211vap *vap, e
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list