From: Luis R. Rodriguez <lrodriguez@atheros.com>
Date: Mon, 30 Aug 2010 21:46:36 +0000 (-0700)
Subject: compat-wireless: fix compilation on iface.c
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3b714ff15ef1b3b714e8eebab99969da4d466d5f;p=openwrt%2Fstaging%2Fblogic.git

compat-wireless: fix compilation on iface.c

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---

diff --git a/crap/0002-ath9k-Add-pktlog-support.patch b/crap/0002-ath9k-Add-pktlog-support.patch
index d8e4b6893b55..117c2659e902 100644
--- a/crap/0002-ath9k-Add-pktlog-support.patch
+++ b/crap/0002-ath9k-Add-pktlog-support.patch
@@ -113,7 +113,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  
  /* 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
@@ -1310,7 +1310,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  	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);
@@ -1318,7 +1318,7 @@ Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
  	/*
  	 * 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);
diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch
index 861a304cfba8..44f27a68ebf5 100644
--- a/patches/25-multicast-list_head.patch
+++ b/patches/25-multicast-list_head.patch
@@ -661,7 +661,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  			 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);