c612413e99c0beff45eee41d684989820dc67ed4
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 008-disable_usb_backport.patch
1 --- a/net/wireless/compat-2.6.28.c
2 +++ b/net/wireless/compat-2.6.28.c
3 @@ -12,10 +12,11 @@
4
5 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28))
6
7 -#include <linux/usb.h>
8 -
9 /* 2.6.28 compat code goes here */
10
11 +#ifdef CONFIG_AR9170_USB
12 +#include <linux/usb.h>
13 +
14 /*
15 * Compat-wireless notes for USB backport stuff:
16 *
17 @@ -206,6 +207,7 @@ int usb_anchor_empty(struct usb_anchor *
18 }
19
20 EXPORT_SYMBOL_GPL(usb_anchor_empty);
21 +#endif /* CONFIG_AR9170_USB */
22
23
24 void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar)
25 --- a/include/net/compat-2.6.28.h
26 +++ b/include/net/compat-2.6.28.h
27 @@ -9,7 +9,6 @@
28
29 #include <linux/skbuff.h>
30 #include <linux/if_ether.h>
31 -#include <linux/usb.h>
32
33 #ifndef ETH_P_PAE
34 #define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */
35 @@ -37,6 +36,8 @@
36 #define pcmcia_parse_tuple(tuple, parse) pccard_parse_tuple(tuple, parse)
37 #endif
38
39 +#ifdef CONFIG_AR9170_USB
40 +#include <linux/usb.h>
41 #if 0
42 extern void usb_poison_urb(struct urb *urb);
43 #endif
44 @@ -49,6 +50,7 @@ extern void usb_poison_anchored_urbs(str
45 extern struct urb *usb_get_from_anchor(struct usb_anchor *anchor);
46 extern void usb_scuttle_anchored_urbs(struct usb_anchor *anchor);
47 extern int usb_anchor_empty(struct usb_anchor *anchor);
48 +#endif /* CONFIG_AR9170_USB */
49
50
51 void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar);
52 --- a/net/wireless/compat-2.6.29.c
53 +++ b/net/wireless/compat-2.6.29.c
54 @@ -12,6 +12,7 @@
55
56 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
57
58 +#ifdef CONFIG_AR9170_USB
59 #include <linux/usb.h>
60
61 /**
62 @@ -34,6 +35,7 @@ void usb_unpoison_anchored_urbs(struct u
63 spin_unlock_irqrestore(&anchor->lock, flags);
64 }
65 EXPORT_SYMBOL_GPL(usb_unpoison_anchored_urbs);
66 +#endif /* CONFIG_AR9170_USB */
67
68
69 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) */
70 --- a/include/net/compat-2.6.29.h
71 +++ b/include/net/compat-2.6.29.h
72 @@ -41,7 +41,9 @@ static inline struct sk_buff *skb_queue_
73 return skb->prev;
74 }
75
76 +#ifdef CONFIG_AR9170_USB
77 extern void usb_unpoison_anchored_urbs(struct usb_anchor *anchor);
78 +#endif /* CONFIG_AR9170_USB */
79
80 #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)) */
81