diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-08-20 17:25:33 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-08-20 17:25:33 +0000 |
| commit | f45985d627ee89901020e20806d507d7670b064e (patch) | |
| tree | 5ad86a152a19830a6795b805bdc38a513618ed2a | |
| parent | 206030282d7788963aa1897883e6675372e64245 (diff) | |
| download | upstream-f45985d627ee89901020e20806d507d7670b064e.tar.gz upstream-f45985d627ee89901020e20806d507d7670b064e.tar.bz2 upstream-f45985d627ee89901020e20806d507d7670b064e.zip | |
mac80211: reorganize compat code to make cfg80211 load without usb
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17339 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/mac80211/patches/011-move_ar9170_usb_compat_code.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/package/mac80211/patches/011-move_ar9170_usb_compat_code.patch b/package/mac80211/patches/011-move_ar9170_usb_compat_code.patch new file mode 100644 index 0000000000..07daada9e9 --- /dev/null +++ b/package/mac80211/patches/011-move_ar9170_usb_compat_code.patch @@ -0,0 +1,72 @@ +--- a/drivers/net/wireless/ath/ar9170/usb.c ++++ b/drivers/net/wireless/ath/ar9170/usb.c +@@ -96,6 +96,34 @@ static struct usb_device_id ar9170_usb_i + }; + MODULE_DEVICE_TABLE(usb, ar9170_usb_ids); + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)) ++ ++#ifdef CONFIG_AR9170_USB ++#include <linux/usb.h> ++ ++/** ++ * usb_unpoison_anchored_urbs - let an anchor be used successfully again ++ * @anchor: anchor the requests are bound to ++ * ++ * Reverses the effect of usb_poison_anchored_urbs ++ * the anchor can be used normally after it returns ++ */ ++void usb_unpoison_anchored_urbs(struct usb_anchor *anchor) ++{ ++ unsigned long flags; ++ struct urb *lazarus; ++ ++ spin_lock_irqsave(&anchor->lock, flags); ++ list_for_each_entry(lazarus, &anchor->urb_list, anchor_list) { ++ usb_unpoison_urb(lazarus); ++ } ++ //anchor->poisoned = 0; /* XXX: cannot backport */ ++ spin_unlock_irqrestore(&anchor->lock, flags); ++} ++EXPORT_SYMBOL_GPL(usb_unpoison_anchored_urbs); ++#endif /* CONFIG_AR9170_USB */ ++ ++ + static void ar9170_usb_submit_urb(struct ar9170_usb *aru) + { + struct urb *urb; +--- a/net/wireless/compat-2.6.29.c ++++ b/net/wireless/compat-2.6.29.c +@@ -12,31 +12,7 @@ + + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)) + +-#ifdef CONFIG_AR9170_USB +-#include <linux/usb.h> +- +-/** +- * usb_unpoison_anchored_urbs - let an anchor be used successfully again +- * @anchor: anchor the requests are bound to +- * +- * Reverses the effect of usb_poison_anchored_urbs +- * the anchor can be used normally after it returns +- */ +-void usb_unpoison_anchored_urbs(struct usb_anchor *anchor) +-{ +- unsigned long flags; +- struct urb *lazarus; +- +- spin_lock_irqsave(&anchor->lock, flags); +- list_for_each_entry(lazarus, &anchor->urb_list, anchor_list) { +- usb_unpoison_urb(lazarus); +- } +- //anchor->poisoned = 0; /* XXX: cannot backport */ +- spin_unlock_irqrestore(&anchor->lock, flags); +-} +-EXPORT_SYMBOL_GPL(usb_unpoison_anchored_urbs); +-#endif /* CONFIG_AR9170_USB */ +- ++/* 2.6.29 compat code goes here */ + + #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) */ + |