summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cfe95b0)
raw | patch | inline | side by side (parent: cfe95b0)
author | Luis R. Rodriguez <lrodriguez@atheros.com> | |
Mon, 30 Aug 2010 21:46:36 +0000 (14:46 -0700) | ||
committer | Luis R. Rodriguez <lrodriguez@atheros.com> | |
Mon, 30 Aug 2010 21:46:59 +0000 (14:46 -0700) |
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
crap/0002-ath9k-Add-pktlog-support.patch | patch | blob | history | |
patches/25-multicast-list_head.patch | patch | blob | history |
index d8e4b6893b552a99ade15e321bce48469e7896d5..117c2659e902c80ff3c2c8f31faa90e4dc7cccd6 100644 (file)
/* Powersave flags */
#define PS_WAIT_FOR_BEACON BIT(0)
-@@ -592,6 +594,10 @@ struct ath_softc {
+@@ -593,6 +595,10 @@ struct ath_softc {
#ifdef CONFIG_ATH9K_DEBUGFS
struct ath9k_debug debug;
#endif
if (conf_is_ht(&sc->hw->conf) &&
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -1080,6 +1080,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
+@@ -1084,6 +1084,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
struct ieee80211_rx_status *rxs;
struct ath_hw *ah = sc->sc_ah;
struct ath_common *common = ath9k_hw_common(ah);
/*
* The hw can techncically differ from common->hw when using ath9k
* virtual wiphy so to account for that we iterate over the active
-@@ -1171,12 +1172,24 @@ int ath_rx_tasklet(struct ath_softc *sc,
+@@ -1175,12 +1176,24 @@ int ath_rx_tasklet(struct ath_softc *sc,
dma_type);
skb_put(skb, rs.rs_datalen + ah->caps.rx_status_len);
index 861a304cfba886672a9b780583d7c3b88409b65d..44f27a68ebf5b0d3347eabf75a42d80e5f25abb7 100644 (file)
sdata->dev->addr_len);
+#else
+ __dev_addr_unsync(&local->mc_list, &local->mc_count,
-+ &dev->mc_list, &dev->mc_count);
++ &sdata->dev->mc_list, &sdata->dev->mc_count);
+#endif
spin_unlock_bh(&local->filter_lock);
netif_addr_unlock_bh(sdata->dev);