Ticket #201: madwifi-suspend-initkeytable.2.diff

ath/if_ath.c

@@ -123 +123 @@
-
-static int ath_stop_locked(struct net_device *);
-static int ath_stop(struct net_device *);
-#if 0
-static void ath_initkeytable(struct ath_softc *);
-#endif
-static int ath_key_alloc(struct ieee80211vap *, const struct ieee80211_key *);
-static int ath_key_delete(struct ieee80211vap *, const struct ieee80211_key *,
-        struct ieee80211_node *);
@@ -1307 +1305 @@
-        struct ath_softc *sc = dev->priv;
-
-        DPRINTF(sc, ATH_DEBUG_ANY, "%s: flags %x\n", __func__, dev->flags);
-ath_stop(dev);
+/* ath_stop(dev); */
-}
-
-void
@@ -1316 +1314 @@
-        struct ath_softc *sc = dev->priv;
-
-        DPRINTF(sc, ATH_DEBUG_ANY, "%s: flags %x\n", __func__, dev->flags);
-
+
+
+
-}
-
-void
@@ -1917 +1917 @@
-         * in the frame output path; there's nothing to do
-         * here except setup the interrupt mask.
-         */
-
-
-
+
+
-        if (ath_startrecv(sc) != 0) {
-                printk("%s: unable to start recv logic\n", dev->name);
-                error = -EIO;
@@ -1957 +1956 @@
-        return error;
-}
-
+static void
+ath_initkeytable(struct ath_softc *sc)
+{
+        struct ieee80211com *ic = &sc->sc_ic;
+        struct ieee80211vap *vap;
+        struct ath_hal *ah = sc->sc_ah;
+        int i;
+
+        TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) {
+                for (i = 0; i < IEEE80211_WEP_NKID; i++) {
+                        struct ieee80211_key *k = &vap->iv_nw_keys[i];
+               
+                        if (k->wk_keylen == 0)
+                                ath_hal_keyreset(ah, i);
+                        else
+                                ath_key_set(vap, k, vap->iv_bss->ni_macaddr);
+                }
+        }
+}
+
-/* Caller must lock ATH_LOCK 
- *
- * Context: softIRQ