reinette chatre wrote:
> Hi Tim,
>
> On Mon, 2009-07-13 at 13:05 -0700, Tim Gardner wrote:
>> reinette chatre wrote:
>>> Hi Tim,
>>>
>>> On Mon, 2009-07-13 at 12:08 -0700, Tim Gardner wrote:
>>>> From 2c7c806570ad72f5af2e778f2fe71aae7d727e02 Mon Sep 17 00:00:00 2001
>>>> From: Tim Gardner <tim.gardner@xxxxxxxxxxxxx>
>>>> Date: Mon, 13 Jul 2009 12:53:32 -0600
>>>> Subject: [PATCH] iwlwifi 3945: Fix IWL_DEBUG_SCAN compile
>>>>
>>>> Added a missing parameter in the macro invocation to correct a
>>>> compile error when CONFIG_IWLWIFI_DEBUG is enabled.
>>>>
>>>> Signed-off-by: Tim Gardner <tim.gardner@xxxxxxxxxxxxx>
>>>> ---
>>>> drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +-
>>>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>>>
>>>> diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
>>>> index 2564288..67332fb 100644
>>>> --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
>>>> +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
>>>> @@ -2962,7 +2962,7 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
>>>> }
>>>>
>>>> if (scan->channel_count == 0) {
>>>> - IWL_DEBUG_SCAN("channel count %d\n", scan->channel_count);
>>>> + IWL_DEBUG_SCAN(priv,"channel count %d\n", scan->channel_count);
>>>> goto done;
>>>> }
>>>>
>>> On which code did you base this patch?
>>>
>>> Reinette
>>>
>>>
>> Head of Linus' tree, but I see that its already fixed in
>> wireless-testing. I guess I pulled the trigger too soon.
>
> I just pulled the latest from Linus but cannot see this problem. We also
> do not have anything related to this pending for 2.6.31.
>
> Reinette
>
>
You are correct. It appears I've got a rebase issue. I rebased Ubuntu
Karmic against linus git 4a390e07fc53ce9dd615d7b788e9ecc73f87ad94 and
find that there is one extra commit when comparing the output of 'git
log --pretty=oneline drivers/net/wireless/iwlwifi/iwl3945-base.c' . The
last commit that touches iwl3945-base.c in the Karmic tree is 'iwl3945:
do not send scan command if channel count zero', which is totally
bizarre. If I look at the patches created by 'git log -p
drivers/net/wireless/iwlwifi/iwl3945-base.c', the patch that implements
'iwl3945: do not send scan command if channel count zero' is duplicated.
How can that be? Guess I'll keep digging.
rtg
--
Tim Gardner timg@xxxxxxx www.tpi.com
OR 503-601-0234 x102 MT 406-443-5357
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
