From 9b2d880b56cc22bc95b50be0e5790bf734bb08cf Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 25 May 2010 14:37:27 -0700 Subject: [PATCH] compat-wireless: remove pending patches as of next-20100525 This only affects tarballs created with the ./scripts/admin-update.sh -p option Signed-off-by: Luis R. Rodriguez --- ...k-remove-AR9003-from-PCI-IDs-for-now.patch | 33 ------------ ...mcast-bcast-frames-in-PS-mode-with-a.patch | 52 ------------------- ...80211-fix-crash-in-cfg80211_set_freq.patch | 28 ---------- 3 files changed, 113 deletions(-) delete mode 100644 linux-next-pending/0005-ath9k-remove-AR9003-from-PCI-IDs-for-now.patch delete mode 100644 linux-next-pending/0010-ath9k-Fix-rx-of-mcast-bcast-frames-in-PS-mode-with-a.patch delete mode 100644 linux-next-pending/0013-cfg80211-fix-crash-in-cfg80211_set_freq.patch diff --git a/linux-next-pending/0005-ath9k-remove-AR9003-from-PCI-IDs-for-now.patch b/linux-next-pending/0005-ath9k-remove-AR9003-from-PCI-IDs-for-now.patch deleted file mode 100644 index ab2293abf149..000000000000 --- a/linux-next-pending/0005-ath9k-remove-AR9003-from-PCI-IDs-for-now.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7400385ea36226c5e27b00112206ebb48803c9e0 Mon Sep 17 00:00:00 2001 -From: Luis R. Rodriguez -Date: Thu, 13 May 2010 14:55:24 -0700 -Subject: [PATCH 05/19] ath9k: remove AR9003 from PCI IDs for now - -We tried to squeeze as much AR9003 support into this kernel -release cycle but there are a few features which are still -being tested and developed. Some of these features are critical -to the stable operation of AR9003 so for now disable AR9003 support -all together. This will get re-enabled once all necessary features -are in place but very likely will not happen for 2.6.35. - -Reviewed-by: Don Breslin -Signed-off-by: Luis R. Rodriguez ---- - drivers/net/wireless/ath/ath9k/pci.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c -index 257b10b..1ec836c 100644 ---- a/drivers/net/wireless/ath/ath9k/pci.c -+++ b/drivers/net/wireless/ath/ath9k/pci.c -@@ -28,7 +28,6 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = { - { PCI_VDEVICE(ATHEROS, 0x002C) }, /* PCI-E 802.11n bonded out */ - { PCI_VDEVICE(ATHEROS, 0x002D) }, /* PCI */ - { PCI_VDEVICE(ATHEROS, 0x002E) }, /* PCI-E */ -- { PCI_VDEVICE(ATHEROS, 0x0030) }, /* PCI-E AR9300 */ - { 0 } - }; - --- -1.6.3.3 - diff --git a/linux-next-pending/0010-ath9k-Fix-rx-of-mcast-bcast-frames-in-PS-mode-with-a.patch b/linux-next-pending/0010-ath9k-Fix-rx-of-mcast-bcast-frames-in-PS-mode-with-a.patch deleted file mode 100644 index f88451dfffbd..000000000000 --- a/linux-next-pending/0010-ath9k-Fix-rx-of-mcast-bcast-frames-in-PS-mode-with-a.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 4239a69db30410f5c2d4b1b76c9a8a566526457f Mon Sep 17 00:00:00 2001 -From: Vasanthakumar Thiagarajan -Date: Tue, 18 May 2010 17:20:39 -0700 -Subject: [PATCH 10/19] ath9k: Fix rx of mcast/bcast frames in PS mode with auto sleep - -Signed-off-by: Vasanthakumar Thiagarajan ---- - drivers/net/wireless/ath/ath9k/recv.c | 14 +++++++++----- - 1 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c -index ba13913..dfb11a6 100644 ---- a/drivers/net/wireless/ath/ath9k/recv.c -+++ b/drivers/net/wireless/ath/ath9k/recv.c -@@ -18,6 +18,9 @@ - #include "ar9003_mac.h" - - #define SKB_CB_ATHBUF(__skb) (*((struct ath_buf **)__skb->cb)) -+#define ATH9K_CHECK_AUTO_SLEEP(__sc) \ -+ (__sc->ps_enabled && \ -+ (__sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_AUTOSLEEP)) - - static struct ieee80211_hw * ath_get_virt_hw(struct ath_softc *sc, - struct ieee80211_hdr *hdr) -@@ -616,8 +619,8 @@ static void ath_rx_ps(struct ath_softc *sc, struct sk_buff *skb) - hdr = (struct ieee80211_hdr *)skb->data; - - /* Process Beacon and CAB receive in PS state */ -- if ((sc->ps_flags & PS_WAIT_FOR_BEACON) && -- ieee80211_is_beacon(hdr->frame_control)) -+ if (((sc->ps_flags & PS_WAIT_FOR_BEACON) || ATH9K_CHECK_AUTO_SLEEP(sc)) -+ && ieee80211_is_beacon(hdr->frame_control)) - ath_rx_ps_beacon(sc, skb); - else if ((sc->ps_flags & PS_WAIT_FOR_CAB) && - (ieee80211_is_data(hdr->frame_control) || -@@ -932,9 +935,10 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) - sc->rx.rxotherant = 0; - } - -- if (unlikely(sc->ps_flags & (PS_WAIT_FOR_BEACON | -- PS_WAIT_FOR_CAB | -- PS_WAIT_FOR_PSPOLL_DATA))) -+ if (unlikely(ATH9K_CHECK_AUTO_SLEEP(sc) || -+ (sc->ps_flags & (PS_WAIT_FOR_BEACON | -+ PS_WAIT_FOR_CAB | -+ PS_WAIT_FOR_PSPOLL_DATA)))) - ath_rx_ps(sc, skb); - - ath_rx_send_to_mac80211(hw, sc, skb, rxs); --- -1.6.3.3 - diff --git a/linux-next-pending/0013-cfg80211-fix-crash-in-cfg80211_set_freq.patch b/linux-next-pending/0013-cfg80211-fix-crash-in-cfg80211_set_freq.patch deleted file mode 100644 index de5895e25df1..000000000000 --- a/linux-next-pending/0013-cfg80211-fix-crash-in-cfg80211_set_freq.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2bf5640c63731982171c9e451f0688994f242678 Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Sat, 15 May 2010 15:46:17 +0200 -Subject: [PATCH 13/19] cfg80211: fix crash in cfg80211_set_freq() - -Since wdev can be NULL, check it before dereferencing it - -Signed-off-by: Felix Fietkau ---- - net/wireless/chan.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/net/wireless/chan.c b/net/wireless/chan.c -index d92d088..b01a6f6 100644 ---- a/net/wireless/chan.c -+++ b/net/wireless/chan.c -@@ -50,7 +50,7 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev, - struct ieee80211_channel *chan; - int result; - -- if (wdev->iftype == NL80211_IFTYPE_MONITOR) -+ if (wdev && wdev->iftype == NL80211_IFTYPE_MONITOR) - wdev = NULL; - - if (wdev) { --- -1.6.3.3 - -- 2.30.2