* [PATCH 2/7] [compat-2.6] Add missing compat-2.6.*.c files
2009-08-08 12:38 [PATCH 1/7] [compat-2.6] Rename the rest of CONFIG_MAC80211_MESH to CONFIG_COMPAT_MAC80211_MESH Hauke Mehrtens
@ 2009-08-08 12:38 ` Hauke Mehrtens
2009-08-08 12:38 ` [PATCH 3/7] [compat-2.6] pcmcia_parse_tuple was redefined in pcmcia/cistpl.h Hauke Mehrtens
` (5 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Hauke Mehrtens @ 2009-08-08 12:38 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
compat/patches/98-add-compat-wireless.patch | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/compat/patches/98-add-compat-wireless.patch b/compat/patches/98-add-compat-wireless.patch
index 1c7b39a..791bc6b 100644
--- a/compat/patches/98-add-compat-wireless.patch
+++ b/compat/patches/98-add-compat-wireless.patch
@@ -19,11 +19,16 @@ added compat.h also for ssb, I forget.
--- a/net/wireless/Makefile 2009-08-07 12:27:50.836497001 -0700
+++ b/net/wireless/Makefile 2009-08-07 12:27:51.952497240 -0700
-@@ -11,3 +11,11 @@
+@@ -11,3 +11,16 @@
cfg80211-$(CONFIG_WIRELESS_EXT) += wext-compat.o wext-sme.o
ccflags-y += -D__CHECK_ENDIAN__
+# Compat-wireless kernel compatibility code
++cfg80211-y += compat-2.6.22.o
++cfg80211-y += compat-2.6.23.o
++cfg80211-y += compat-2.6.24.o
++cfg80211-y += compat-2.6.25.o
++cfg80211-y += compat-2.6.26.o
+cfg80211-y += compat-2.6.27.o
+cfg80211-y += compat-2.6.28.o
+cfg80211-y += compat-2.6.29.o
--
1.6.2.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 3/7] [compat-2.6] pcmcia_parse_tuple was redefined in pcmcia/cistpl.h
2009-08-08 12:38 [PATCH 1/7] [compat-2.6] Rename the rest of CONFIG_MAC80211_MESH to CONFIG_COMPAT_MAC80211_MESH Hauke Mehrtens
2009-08-08 12:38 ` [PATCH 2/7] [compat-2.6] Add missing compat-2.6.*.c files Hauke Mehrtens
@ 2009-08-08 12:38 ` Hauke Mehrtens
2009-08-10 22:20 ` Luis R. Rodriguez
2009-08-08 12:38 ` [PATCH 4/7] [compat-2.6] Clean up compat-2.6.26.c Hauke Mehrtens
` (4 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Hauke Mehrtens @ 2009-08-08 12:38 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
fix build:
undef pcmcia_parse_tuple before redefine it again.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
compat/compat-2.6.28.h | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/compat/compat-2.6.28.h b/compat/compat-2.6.28.h
index fdc021a..e25259f 100644
--- a/compat/compat-2.6.28.h
+++ b/compat/compat-2.6.28.h
@@ -29,7 +29,13 @@
})
#endif /* From include/asm-generic/bug.h */
-#define pcmcia_parse_tuple(tuple, parse) pcmcia_parse_tuple(NULL, tuple, parse)
+#include <pcmcia/cs_types.h>
+#include <pcmcia/cs.h>
+#include <pcmcia/cistpl.h>
+#ifdef pcmcia_parse_tuple
+#undef pcmcia_parse_tuple
+#define pcmcia_parse_tuple(tuple, parse) pccard_parse_tuple(tuple, parse)
+#endif
#if 0
extern void usb_poison_urb(struct urb *urb);
--
1.6.2.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 3/7] [compat-2.6] pcmcia_parse_tuple was redefined in pcmcia/cistpl.h
2009-08-08 12:38 ` [PATCH 3/7] [compat-2.6] pcmcia_parse_tuple was redefined in pcmcia/cistpl.h Hauke Mehrtens
@ 2009-08-10 22:20 ` Luis R. Rodriguez
2009-08-11 20:53 ` Hauke Mehrtens
0 siblings, 1 reply; 13+ messages in thread
From: Luis R. Rodriguez @ 2009-08-10 22:20 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: linux-wireless
On Sat, Aug 8, 2009 at 5:38 AM, Hauke Mehrtens<hauke@hauke-m.de> wrote:
> fix build:
> undef pcmcia_parse_tuple before redefine it again.
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
> ---
> compat/compat-2.6.28.h | 8 +++++++-
> 1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/compat/compat-2.6.28.h b/compat/compat-2.6.28.h
> index fdc021a..e25259f 100644
> --- a/compat/compat-2.6.28.h
> +++ b/compat/compat-2.6.28.h
> @@ -29,7 +29,13 @@
> })
> #endif /* From include/asm-generic/bug.h */
>
> -#define pcmcia_parse_tuple(tuple, parse) pcmcia_parse_tuple(NULL, tuple, parse)
> +#include <pcmcia/cs_types.h>
> +#include <pcmcia/cs.h>
> +#include <pcmcia/cistpl.h>
> +#ifdef pcmcia_parse_tuple
> +#undef pcmcia_parse_tuple
> +#define pcmcia_parse_tuple(tuple, parse) pccard_parse_tuple(tuple, parse)
> +#endif
Where did pccard_parse_tuple() come from?
Did you see the commit 0df8084caf53774113c8f118e9dd43e660cf9e15 by any
chance? That fixed compilation for me against older kernels.
Luis
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/7] [compat-2.6] pcmcia_parse_tuple was redefined in pcmcia/cistpl.h
2009-08-10 22:20 ` Luis R. Rodriguez
@ 2009-08-11 20:53 ` Hauke Mehrtens
2009-08-11 21:04 ` Luis R. Rodriguez
0 siblings, 1 reply; 13+ messages in thread
From: Hauke Mehrtens @ 2009-08-11 20:53 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: linux-wireless
[-- Attachment #1: Type: text/plain, Size: 2020 bytes --]
Hi Luis,
Thank you for applying the rest of the patches. Next time I will use
--cover-letter when generating the patches.
Luis R. Rodriguez wrote:
> On Sat, Aug 8, 2009 at 5:38 AM, Hauke Mehrtens<hauke@hauke-m.de> wrote:
>> fix build:
>> undef pcmcia_parse_tuple before redefine it again.
>>
>> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
>> ---
>> compat/compat-2.6.28.h | 8 +++++++-
>> 1 files changed, 7 insertions(+), 1 deletions(-)
>>
>> diff --git a/compat/compat-2.6.28.h b/compat/compat-2.6.28.h
>> index fdc021a..e25259f 100644
>> --- a/compat/compat-2.6.28.h
>> +++ b/compat/compat-2.6.28.h
>> @@ -29,7 +29,13 @@
>> })
>> #endif /* From include/asm-generic/bug.h */
>>
>> -#define pcmcia_parse_tuple(tuple, parse) pcmcia_parse_tuple(NULL, tuple, parse)
>> +#include <pcmcia/cs_types.h>
>> +#include <pcmcia/cs.h>
>> +#include <pcmcia/cistpl.h>
>> +#ifdef pcmcia_parse_tuple
>> +#undef pcmcia_parse_tuple
>> +#define pcmcia_parse_tuple(tuple, parse) pccard_parse_tuple(tuple, parse)
>> +#endif
>
> Where did pccard_parse_tuple() come from?
In include/pcmcia/cistpl.h pcmcia_parse_tuple(p_dev, tuple, parse) is
defined as pccard_parse_tuple(tuple, parse)
> Did you see the commit 0df8084caf53774113c8f118e9dd43e660cf9e15 by any
> chance? That fixed compilation for me against older kernels.
I still get a compile error with recent compat-wireless including commit
0df8084caf53774113c8f118e9dd43e660cf9e15 with kernel <= 2.6.27 in Ubuntu:
In file included from
/compat-wireless-git/drivers/net/wireless/b43/pcmcia.c:30:
include/pcmcia/cistpl.h:610:1: warning: "pcmcia_parse_tuple" redefined
In file included from /compat-wireless-git/include/net/compat.h:19,
from <command-line>:0:
/compat-wireless-git/include/net/compat-2.6.28.h:32:1: warning: this is
the location of the previous definition
The above patch fixes it for me. The patch does not look relay nice, do
you have a better idea how to solve this problem?
Hauke
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 898 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 3/7] [compat-2.6] pcmcia_parse_tuple was redefined in pcmcia/cistpl.h
2009-08-11 20:53 ` Hauke Mehrtens
@ 2009-08-11 21:04 ` Luis R. Rodriguez
2009-08-13 2:03 ` Luis R. Rodriguez
0 siblings, 1 reply; 13+ messages in thread
From: Luis R. Rodriguez @ 2009-08-11 21:04 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: linux-wireless
On Tue, Aug 11, 2009 at 1:53 PM, Hauke Mehrtens<hauke@hauke-m.de> wrote:
> Hi Luis,
>
> Thank you for applying the rest of the patches. Next time I will use
> --cover-letter when generating the patches.
>
> Luis R. Rodriguez wrote:
>> On Sat, Aug 8, 2009 at 5:38 AM, Hauke Mehrtens<hauke@hauke-m.de> wrote:
>>> fix build:
>>> undef pcmcia_parse_tuple before redefine it again.
>>>
>>> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
>>> ---
>>> compat/compat-2.6.28.h | 8 +++++++-
>>> 1 files changed, 7 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/compat/compat-2.6.28.h b/compat/compat-2.6.28.h
>>> index fdc021a..e25259f 100644
>>> --- a/compat/compat-2.6.28.h
>>> +++ b/compat/compat-2.6.28.h
>>> @@ -29,7 +29,13 @@
>>> })
>>> #endif /* From include/asm-generic/bug.h */
>>>
>>> -#define pcmcia_parse_tuple(tuple, parse) pcmcia_parse_tuple(NULL, tuple, parse)
>>> +#include <pcmcia/cs_types.h>
>>> +#include <pcmcia/cs.h>
>>> +#include <pcmcia/cistpl.h>
>>> +#ifdef pcmcia_parse_tuple
>>> +#undef pcmcia_parse_tuple
>>> +#define pcmcia_parse_tuple(tuple, parse) pccard_parse_tuple(tuple, parse)
>>> +#endif
>>
>> Where did pccard_parse_tuple() come from?
> In include/pcmcia/cistpl.h pcmcia_parse_tuple(p_dev, tuple, parse) is
> defined as pccard_parse_tuple(tuple, parse)
>
>> Did you see the commit 0df8084caf53774113c8f118e9dd43e660cf9e15 by any
>> chance? That fixed compilation for me against older kernels.
> I still get a compile error with recent compat-wireless including commit
> 0df8084caf53774113c8f118e9dd43e660cf9e15 with kernel <= 2.6.27 in Ubuntu:
>
> In file included from
> /compat-wireless-git/drivers/net/wireless/b43/pcmcia.c:30:
> include/pcmcia/cistpl.h:610:1: warning: "pcmcia_parse_tuple" redefined
> In file included from /compat-wireless-git/include/net/compat.h:19,
> from <command-line>:0:
> /compat-wireless-git/include/net/compat-2.6.28.h:32:1: warning: this is
> the location of the previous definition
>
> The above patch fixes it for me. The patch does not look relay nice, do
> you have a better idea how to solve this problem?
Hm odd, compilation worked for me against 2.6.27 using KLIB and
KLIB_BUILD. I'll try to do that again today see if I still can compile
ok or not.
Luis
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/7] [compat-2.6] pcmcia_parse_tuple was redefined in pcmcia/cistpl.h
2009-08-11 21:04 ` Luis R. Rodriguez
@ 2009-08-13 2:03 ` Luis R. Rodriguez
0 siblings, 0 replies; 13+ messages in thread
From: Luis R. Rodriguez @ 2009-08-13 2:03 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: linux-wireless
On Tue, Aug 11, 2009 at 2:04 PM, Luis R.
Rodriguez<lrodriguez@atheros.com> wrote:
> On Tue, Aug 11, 2009 at 1:53 PM, Hauke Mehrtens<hauke@hauke-m.de> wrote:
>> Hi Luis,
>>
>> Thank you for applying the rest of the patches. Next time I will use
>> --cover-letter when generating the patches.
>>
>> Luis R. Rodriguez wrote:
>>> On Sat, Aug 8, 2009 at 5:38 AM, Hauke Mehrtens<hauke@hauke-m.de> wrote:
>>>> fix build:
>>>> undef pcmcia_parse_tuple before redefine it again.
>>>>
>>>> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
>>>> ---
>>>> compat/compat-2.6.28.h | 8 +++++++-
>>>> 1 files changed, 7 insertions(+), 1 deletions(-)
>>>>
>>>> diff --git a/compat/compat-2.6.28.h b/compat/compat-2.6.28.h
>>>> index fdc021a..e25259f 100644
>>>> --- a/compat/compat-2.6.28.h
>>>> +++ b/compat/compat-2.6.28.h
>>>> @@ -29,7 +29,13 @@
>>>> })
>>>> #endif /* From include/asm-generic/bug.h */
>>>>
>>>> -#define pcmcia_parse_tuple(tuple, parse) pcmcia_parse_tuple(NULL, tuple, parse)
>>>> +#include <pcmcia/cs_types.h>
>>>> +#include <pcmcia/cs.h>
>>>> +#include <pcmcia/cistpl.h>
>>>> +#ifdef pcmcia_parse_tuple
>>>> +#undef pcmcia_parse_tuple
>>>> +#define pcmcia_parse_tuple(tuple, parse) pccard_parse_tuple(tuple, parse)
>>>> +#endif
>>>
>>> Where did pccard_parse_tuple() come from?
>> In include/pcmcia/cistpl.h pcmcia_parse_tuple(p_dev, tuple, parse) is
>> defined as pccard_parse_tuple(tuple, parse)
>>
>>> Did you see the commit 0df8084caf53774113c8f118e9dd43e660cf9e15 by any
>>> chance? That fixed compilation for me against older kernels.
>> I still get a compile error with recent compat-wireless including commit
>> 0df8084caf53774113c8f118e9dd43e660cf9e15 with kernel <= 2.6.27 in Ubuntu:
>>
>> In file included from
>> /compat-wireless-git/drivers/net/wireless/b43/pcmcia.c:30:
>> include/pcmcia/cistpl.h:610:1: warning: "pcmcia_parse_tuple" redefined
>> In file included from /compat-wireless-git/include/net/compat.h:19,
>> from <command-line>:0:
>> /compat-wireless-git/include/net/compat-2.6.28.h:32:1: warning: this is
>> the location of the previous definition
>>
>> The above patch fixes it for me. The patch does not look relay nice, do
>> you have a better idea how to solve this problem?
>
> Hm odd, compilation worked for me against 2.6.27 using KLIB and
> KLIB_BUILD. I'll try to do that again today see if I still can compile
> ok or not.
OK thanks for the patch, applied!
Luis
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 4/7] [compat-2.6] Clean up compat-2.6.26.c
2009-08-08 12:38 [PATCH 1/7] [compat-2.6] Rename the rest of CONFIG_MAC80211_MESH to CONFIG_COMPAT_MAC80211_MESH Hauke Mehrtens
2009-08-08 12:38 ` [PATCH 2/7] [compat-2.6] Add missing compat-2.6.*.c files Hauke Mehrtens
2009-08-08 12:38 ` [PATCH 3/7] [compat-2.6] pcmcia_parse_tuple was redefined in pcmcia/cistpl.h Hauke Mehrtens
@ 2009-08-08 12:38 ` Hauke Mehrtens
2009-08-08 12:38 ` [PATCH 5/7] [compat-2.6] Remove wext building Hauke Mehrtens
` (3 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Hauke Mehrtens @ 2009-08-08 12:38 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
The exported methods are not used.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
compat/compat-2.6.26.c | 107 ------------------------------------------------
1 files changed, 0 insertions(+), 107 deletions(-)
diff --git a/compat/compat-2.6.26.c b/compat/compat-2.6.26.c
index 206e2f1..960a79a 100644
--- a/compat/compat-2.6.26.c
+++ b/compat/compat-2.6.26.c
@@ -19,75 +19,6 @@
/* All things not in 2.6.25 */
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
-#include <linux/kobject.h>
-#include <linux/string.h>
-#include <linux/module.h>
-#include <linux/stat.h>
-#include <linux/slab.h>
-
-static void device_create_release(struct device *dev)
-{
- pr_debug("device: '%s': %s\n", dev->bus_id, __func__);
- kfree(dev);
-}
-
-/**
- * device_create_vargs - creates a device and registers it with sysfs
- * @class: pointer to the struct class that this device should be registered to
- * @parent: pointer to the parent struct device of this new device, if any
- * @devt: the dev_t for the char device to be added
- * @drvdata: the data to be added to the device for callbacks
- * @fmt: string for the device's name
- * @args: va_list for the device's name
- *
- * This function can be used by char device classes. A struct device
- * will be created in sysfs, registered to the specified class.
- *
- * A "dev" file will be created, showing the dev_t for the device, if
- * the dev_t is not 0,0.
- * If a pointer to a parent struct device is passed in, the newly created
- * struct device will be a child of that device in sysfs.
- * The pointer to the struct device will be returned from the call.
- * Any further sysfs files that might be required can be created using this
- * pointer.
- *
- * Note: the struct class passed to this function must have previously
- * been created with a call to class_create().
- */
-struct device *device_create_vargs(struct class *class, struct device *parent,
- dev_t devt, void *drvdata, const char *fmt,
- va_list args)
-{
- struct device *dev = NULL;
- int retval = -ENODEV;
-
- if (class == NULL || IS_ERR(class))
- goto error;
-
- dev = kzalloc(sizeof(*dev), GFP_KERNEL);
- if (!dev) {
- retval = -ENOMEM;
- goto error;
- }
-
- dev->devt = devt;
- dev->class = class;
- dev->parent = parent;
- dev->release = device_create_release;
- dev_set_drvdata(dev, drvdata);
-
- vsnprintf(dev->bus_id, BUS_ID_SIZE, fmt, args);
- retval = device_register(dev);
- if (retval)
- goto error;
-
- return dev;
-
-error:
- kfree(dev);
- return ERR_PTR(retval);
-}
-EXPORT_SYMBOL_GPL(device_create_vargs);
/**
* kobject_set_name_vargs - Set the name of an kobject
@@ -134,43 +65,5 @@ int dev_set_name(struct device *dev, const char *fmt, ...)
}
EXPORT_SYMBOL_GPL(dev_set_name);
-
-/**
- * device_create_drvdata - creates a device and registers it with sysfs
- * @class: pointer to the struct class that this device should be registered to
- * @parent: pointer to the parent struct device of this new device, if any
- * @devt: the dev_t for the char device to be added
- * @drvdata: the data to be added to the device for callbacks
- * @fmt: string for the device's name
- *
- * This function can be used by char device classes. A struct device
- * will be created in sysfs, registered to the specified class.
- *
- * A "dev" file will be created, showing the dev_t for the device, if
- * the dev_t is not 0,0.
- * If a pointer to a parent struct device is passed in, the newly created
- * struct device will be a child of that device in sysfs.
- * The pointer to the struct device will be returned from the call.
- * Any further sysfs files that might be required can be created using this
- * pointer.
- *
- * Note: the struct class passed to this function must have previously
- * been created with a call to class_create().
- */
-struct device *device_create_drvdata(struct class *class,
- struct device *parent,
- dev_t devt,
- void *drvdata,
- const char *fmt, ...)
-{
- va_list vargs;
- struct device *dev;
-
- va_start(vargs, fmt);
- dev = device_create_vargs(class, parent, devt, drvdata, fmt, vargs);
- va_end(vargs);
- return dev;
-}
-EXPORT_SYMBOL_GPL(device_create_drvdata);
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
--
1.6.2.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 5/7] [compat-2.6] Remove wext building
2009-08-08 12:38 [PATCH 1/7] [compat-2.6] Rename the rest of CONFIG_MAC80211_MESH to CONFIG_COMPAT_MAC80211_MESH Hauke Mehrtens
` (2 preceding siblings ...)
2009-08-08 12:38 ` [PATCH 4/7] [compat-2.6] Clean up compat-2.6.26.c Hauke Mehrtens
@ 2009-08-08 12:38 ` Hauke Mehrtens
2009-08-08 12:38 ` [PATCH 6/7] [compat-2.6] Rename CONFIG_IWL4965 symbol Hauke Mehrtens
` (2 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Hauke Mehrtens @ 2009-08-08 12:38 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
wext can not be build as a module. We do not need to build it,
so remove it from the Makefile.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
compat/patches/99-change-makefiles.patch | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/compat/patches/99-change-makefiles.patch b/compat/patches/99-change-makefiles.patch
index 19e5d1d..b5a0f10 100644
--- a/compat/patches/99-change-makefiles.patch
+++ b/compat/patches/99-change-makefiles.patch
@@ -84,3 +84,10 @@ only the wireless stuff.
obj-$(CONFIG_LIBERTAS) += libertas/
obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/
+--- a/net/wireless/Makefile
++++ b/net/wireless/Makefile
+@@ -1,4 +1,3 @@
+-obj-$(CONFIG_WIRELESS_EXT) += wext.o
+ obj-$(CONFIG_CFG80211) += cfg80211.o
+ obj-$(CONFIG_LIB80211) += lib80211.o
+ obj-$(CONFIG_LIB80211_CRYPT_WEP) += lib80211_crypt_wep.o
--
1.6.2.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 6/7] [compat-2.6] Rename CONFIG_IWL4965 symbol
2009-08-08 12:38 [PATCH 1/7] [compat-2.6] Rename the rest of CONFIG_MAC80211_MESH to CONFIG_COMPAT_MAC80211_MESH Hauke Mehrtens
` (3 preceding siblings ...)
2009-08-08 12:38 ` [PATCH 5/7] [compat-2.6] Remove wext building Hauke Mehrtens
@ 2009-08-08 12:38 ` Hauke Mehrtens
2009-08-08 12:38 ` [PATCH 7/7] [compat-2.6] Remove unsed code Hauke Mehrtens
2009-08-10 22:50 ` [PATCH 1/7] [compat-2.6] Rename the rest of CONFIG_MAC80211_MESH to CONFIG_COMPAT_MAC80211_MESH Luis R. Rodriguez
6 siblings, 0 replies; 13+ messages in thread
From: Hauke Mehrtens @ 2009-08-08 12:38 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
In kernel 2.6.26 and older CONFIG_IWL4965 was build as an extra
module, but now it is directly included in the iwlagn.
CONFIG_IWL4965 has to be set to y, to build correctly.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
compat/patches/09-rename-iwl4965-config.patch | 31 +++++++++++++++++++++++++
config.mk | 2 +-
2 files changed, 32 insertions(+), 1 deletions(-)
create mode 100644 compat/patches/09-rename-iwl4965-config.patch
diff --git a/compat/patches/09-rename-iwl4965-config.patch b/compat/patches/09-rename-iwl4965-config.patch
new file mode 100644
index 0000000..e539c75
--- /dev/null
+++ b/compat/patches/09-rename-iwl4965-config.patch
@@ -0,0 +1,31 @@
+In kernel 2.6.26 and older CONFIG_IWL4965 was build as an extra
+module, but now it is directly included in the iwlagn.
+
+CONFIG_IWL4965 has to be set to y, to build correctly.
+
+--- a/drivers/net/wireless/iwlwifi/Makefile
++++ b/drivers/net/wireless/iwlwifi/Makefile
+@@ -9,7 +9,7 @@ iwlcore-$(CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT) += iwl-spectrum.o
+ obj-$(CONFIG_IWLAGN) += iwlagn.o
+ iwlagn-objs := iwl-agn.o iwl-agn-rs.o
+
+-iwlagn-$(CONFIG_IWL4965) += iwl-4965.o
++iwlagn-$(CONFIG_COMPAT_IWL4965) += iwl-4965.o
+ iwlagn-$(CONFIG_IWL5000) += iwl-5000.o
+ iwlagn-$(CONFIG_IWL5000) += iwl-6000.o
+ iwlagn-$(CONFIG_IWL5000) += iwl-1000.o
+--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
++++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
+@@ -3088,10 +3088,10 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)
+
+ /* Hardware specific file defines the PCI IDs table for that hardware module */
+ static struct pci_device_id iwl_hw_card_ids[] = {
+-#ifdef CONFIG_IWL4965
++#ifdef CONFIG_COMPAT_IWL4965
+ {IWL_PCI_DEVICE(0x4229, PCI_ANY_ID, iwl4965_agn_cfg)},
+ {IWL_PCI_DEVICE(0x4230, PCI_ANY_ID, iwl4965_agn_cfg)},
+-#endif /* CONFIG_IWL4965 */
++#endif /* CONFIG_COMPAT_IWL4965 */
+ #ifdef CONFIG_IWL5000
+ {IWL_PCI_DEVICE(0x4232, 0x1205, iwl5100_bg_cfg)},
+ {IWL_PCI_DEVICE(0x4232, 0x1305, iwl5100_bg_cfg)},
diff --git a/config.mk b/config.mk
index 0d8962b..2dab9af 100644
--- a/config.mk
+++ b/config.mk
@@ -135,7 +135,7 @@ CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
# CONFIG_IWLWIFI_DEBUG=y
# CONFIG_IWLWIFI_DEBUGFS=y
CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
+CONFIG_COMPAT_IWL4965=y
CONFIG_IWL5000=y
CONFIG_IWL3945=m
CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
--
1.6.2.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 7/7] [compat-2.6] Remove unsed code.
2009-08-08 12:38 [PATCH 1/7] [compat-2.6] Rename the rest of CONFIG_MAC80211_MESH to CONFIG_COMPAT_MAC80211_MESH Hauke Mehrtens
` (4 preceding siblings ...)
2009-08-08 12:38 ` [PATCH 6/7] [compat-2.6] Rename CONFIG_IWL4965 symbol Hauke Mehrtens
@ 2009-08-08 12:38 ` Hauke Mehrtens
2009-08-10 22:49 ` Luis R. Rodriguez
2009-08-10 22:50 ` [PATCH 1/7] [compat-2.6] Rename the rest of CONFIG_MAC80211_MESH to CONFIG_COMPAT_MAC80211_MESH Luis R. Rodriguez
6 siblings, 1 reply; 13+ messages in thread
From: Hauke Mehrtens @ 2009-08-08 12:38 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
compat/compat-2.6.28.c | 40 ----------------------------------------
compat/compat-2.6.28.h | 3 ---
2 files changed, 0 insertions(+), 43 deletions(-)
diff --git a/compat/compat-2.6.28.c b/compat/compat-2.6.28.c
index 33871a2..965be80 100644
--- a/compat/compat-2.6.28.c
+++ b/compat/compat-2.6.28.c
@@ -167,46 +167,6 @@ struct urb *usb_get_from_anchor(struct usb_anchor *anchor)
EXPORT_SYMBOL_GPL(usb_get_from_anchor);
-/**
- * usb_scuttle_anchored_urbs - unanchor all an anchor's urbs
- * @anchor: the anchor whose urbs you want to unanchor
- *
- * use this to get rid of all an anchor's urbs
- */
-void usb_scuttle_anchored_urbs(struct usb_anchor *anchor)
-{
- struct urb *victim;
- unsigned long flags;
-
- spin_lock_irqsave(&anchor->lock, flags);
- while (!list_empty(&anchor->urb_list)) {
- victim = list_entry(anchor->urb_list.prev, struct urb,
- anchor_list);
- usb_get_urb(victim);
- spin_unlock_irqrestore(&anchor->lock, flags);
- /* this may free the URB */
- usb_unanchor_urb(victim);
- usb_put_urb(victim);
- spin_lock_irqsave(&anchor->lock, flags);
- }
- spin_unlock_irqrestore(&anchor->lock, flags);
-}
-
-EXPORT_SYMBOL_GPL(usb_scuttle_anchored_urbs);
-
-/**
- * usb_anchor_empty - is an anchor empty
- * @anchor: the anchor you want to query
- *
- * returns 1 if the anchor has no urbs associated with it
- */
-int usb_anchor_empty(struct usb_anchor *anchor)
-{
- return list_empty(&anchor->urb_list);
-}
-
-EXPORT_SYMBOL_GPL(usb_anchor_empty);
-
void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar)
{
diff --git a/compat/compat-2.6.28.h b/compat/compat-2.6.28.h
index e25259f..0a305d2 100644
--- a/compat/compat-2.6.28.h
+++ b/compat/compat-2.6.28.h
@@ -47,9 +47,6 @@ extern void usb_poison_anchored_urbs(struct usb_anchor *anchor);
#endif
extern struct urb *usb_get_from_anchor(struct usb_anchor *anchor);
-extern void usb_scuttle_anchored_urbs(struct usb_anchor *anchor);
-extern int usb_anchor_empty(struct usb_anchor *anchor);
-
void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar);
--
1.6.2.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 7/7] [compat-2.6] Remove unsed code.
2009-08-08 12:38 ` [PATCH 7/7] [compat-2.6] Remove unsed code Hauke Mehrtens
@ 2009-08-10 22:49 ` Luis R. Rodriguez
0 siblings, 0 replies; 13+ messages in thread
From: Luis R. Rodriguez @ 2009-08-10 22:49 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: linux-wireless
On Sat, Aug 8, 2009 at 5:38 AM, Hauke Mehrtens<hauke@hauke-m.de> wrote:
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
So actually I have this here for when we get around to backport the
usb stuff to older kernels, the usb poison stuff, if I remember
correctly. I just never finished that. I'd prefer to drop it if we're
sure we won't need it to make ar9170 compile against older kernels.
Luis
> ---
> compat/compat-2.6.28.c | 40 ----------------------------------------
> compat/compat-2.6.28.h | 3 ---
> 2 files changed, 0 insertions(+), 43 deletions(-)
>
> diff --git a/compat/compat-2.6.28.c b/compat/compat-2.6.28.c
> index 33871a2..965be80 100644
> --- a/compat/compat-2.6.28.c
> +++ b/compat/compat-2.6.28.c
> @@ -167,46 +167,6 @@ struct urb *usb_get_from_anchor(struct usb_anchor *anchor)
>
> EXPORT_SYMBOL_GPL(usb_get_from_anchor);
>
> -/**
> - * usb_scuttle_anchored_urbs - unanchor all an anchor's urbs
> - * @anchor: the anchor whose urbs you want to unanchor
> - *
> - * use this to get rid of all an anchor's urbs
> - */
> -void usb_scuttle_anchored_urbs(struct usb_anchor *anchor)
> -{
> - struct urb *victim;
> - unsigned long flags;
> -
> - spin_lock_irqsave(&anchor->lock, flags);
> - while (!list_empty(&anchor->urb_list)) {
> - victim = list_entry(anchor->urb_list.prev, struct urb,
> - anchor_list);
> - usb_get_urb(victim);
> - spin_unlock_irqrestore(&anchor->lock, flags);
> - /* this may free the URB */
> - usb_unanchor_urb(victim);
> - usb_put_urb(victim);
> - spin_lock_irqsave(&anchor->lock, flags);
> - }
> - spin_unlock_irqrestore(&anchor->lock, flags);
> -}
> -
> -EXPORT_SYMBOL_GPL(usb_scuttle_anchored_urbs);
> -
> -/**
> - * usb_anchor_empty - is an anchor empty
> - * @anchor: the anchor you want to query
> - *
> - * returns 1 if the anchor has no urbs associated with it
> - */
> -int usb_anchor_empty(struct usb_anchor *anchor)
> -{
> - return list_empty(&anchor->urb_list);
> -}
> -
> -EXPORT_SYMBOL_GPL(usb_anchor_empty);
> -
>
> void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar)
> {
> diff --git a/compat/compat-2.6.28.h b/compat/compat-2.6.28.h
> index e25259f..0a305d2 100644
> --- a/compat/compat-2.6.28.h
> +++ b/compat/compat-2.6.28.h
> @@ -47,9 +47,6 @@ extern void usb_poison_anchored_urbs(struct usb_anchor *anchor);
> #endif
>
> extern struct urb *usb_get_from_anchor(struct usb_anchor *anchor);
> -extern void usb_scuttle_anchored_urbs(struct usb_anchor *anchor);
> -extern int usb_anchor_empty(struct usb_anchor *anchor);
> -
>
> void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar);
>
> --
> 1.6.2.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/7] [compat-2.6] Rename the rest of CONFIG_MAC80211_MESH to CONFIG_COMPAT_MAC80211_MESH
2009-08-08 12:38 [PATCH 1/7] [compat-2.6] Rename the rest of CONFIG_MAC80211_MESH to CONFIG_COMPAT_MAC80211_MESH Hauke Mehrtens
` (5 preceding siblings ...)
2009-08-08 12:38 ` [PATCH 7/7] [compat-2.6] Remove unsed code Hauke Mehrtens
@ 2009-08-10 22:50 ` Luis R. Rodriguez
6 siblings, 0 replies; 13+ messages in thread
From: Luis R. Rodriguez @ 2009-08-10 22:50 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: linux-wireless
On Sat, Aug 8, 2009 at 5:38 AM, Hauke Mehrtens<hauke@hauke-m.de> wrote:
> Without this, some symbols can not be resolved because only parts of mesh were disabled.
Thanks a lot! I applied this and the rest of the patches, except for
the few I noted (tuple, usb compat removal).
Luis
^ permalink raw reply [flat|nested] 13+ messages in thread