mac80211: update to trunk as of r26534

[openwrt-10.03/.git] / package / mac80211 / patches / 520-mac80211_drv_tim_override.patch

diff --git a/package/mac80211/patches/520-mac80211_drv_tim_override.patch b/package/mac80211/patches/520-mac80211_drv_tim_override.patch
index 475ce497c657c8015304deea5d9de569b1c9c8a3..7b192e16ae9582a5aa9a480107f0b83a82c711de 100644 (file)
--- a/package/mac80211/patches/520-mac80211_drv_tim_override.patch
+++ b/package/mac80211/patches/520-mac80211_drv_tim_override.patch
@@ -1,6 +1,6 @@
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -2216,6 +2216,18 @@ static inline int ieee80211_sta_ps_trans
+@@ -2227,6 +2227,18 @@ static inline int ieee80211_sta_ps_trans
  #define IEEE80211_TX_STATUS_HEADROOM  13
  
  /**
@@ -31,7 +31,7 @@
                        sta_info_clear_tim_bit(sta);
        }
  
-@@ -902,6 +903,7 @@ void ieee80211_sta_ps_deliver_wakeup(str
+@@ -893,6 +894,7 @@ void ieee80211_sta_ps_deliver_wakeup(str
        struct ieee80211_local *local = sdata->local;
        int sent, buffered;
  
@@ -39,7 +39,7 @@
        if (!(local->hw.flags & IEEE80211_HW_AP_LINK_PS))
                drv_sta_notify(local, sdata, STA_NOTIFY_AWAKE, &sta->sta);
  
-@@ -994,3 +996,12 @@ void ieee80211_sta_block_awake(struct ie
+@@ -985,3 +987,12 @@ void ieee80211_sta_block_awake(struct ie
                ieee80211_queue_work(hw, &sta->drv_unblock_wk);
  }
  EXPORT_SYMBOL(ieee80211_sta_block_awake);