2008-07-14 19:38:05

by John W. Linville

[permalink] [raw]
Subject: pull request: wireless-next-2.6 2008-07-14

Dave,

Here is one last(?) round of miscellaneous patches I hope to get into
2.6.27. There are mostly driver updates, including a sizable iwlwifi
set of changes.

Please let me know if there are problems!

Thanks,

John

---

Individual patches are available here:

http://www.kernel.org/pub/linux/kernel/people/linville/wireless-next-2.6/

---

The following changes since commit 79d16385c7f287a33ea771c4dbe60ae43f791b49:
David S. Miller (1):
netdev: Move atomic queue state bits into netdev_queue.

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git master

Abhijeet Kolekar (2):
iwlwifi: Fix LEDs for 3945
iwlwifi: make index unsigned int for iwl_send_led_cmd

Adel Gadllah (1):
iwl3965: remove useless network and duplicate checking

Emmanuel Grumbach (4):
mac80211: Fix ieee80211_rx_reorder_ampdu: ignore QoS null packets
mac80211: dont add a STA which is not in the same IBSS
iwlwifi: fixes RTS / CTS support
iwlwifi: make iwl4965_mac_conf_tx in atomic context

Esti Kummer (1):
iwlwifi: adding pci device ids to iwl_hw_card_ids

Herton Ronaldo Krzesinski (1):
rtl8187: use different ANAPARAM*_OFF values for 8187B

Ihar Hrachyshka (1):
rtl8187: Fixed section mismatch in rtl8187_dev.c

Ivo van Doorn (4):
rt2x00: Fix NULL pointer error in adhoc/master mode
rt2x00: Add support for CTS protection in rt2x00lib
rt2x00: Reorganize beacon handling
rt2x00: Reset LED assoc status after firmware update

Johannes Berg (9):
mac80211: make master netdev handling sane
mac80211: revamp virtual interface handling
mac80211: push interface checks down
mac80211: revamp beacon configuration
mac80211: fix RX sequence number check
wext: make sysfs bits optional and deprecate them
mac80211: fix TX sequence numbers
mac80211: fix struct ieee80211_tx_queue_params
mac80211 hwsim: fix endianness bug

Michael Buesch (1):
ssb: Include dma-mapping.h

Samuel Ortiz (1):
mac80211: power management wext hooks

Tomas Winkler (8):
iwlwif: remove compilation warnings iwl_add_radiotap
iwlwifi: remove post associate work
iwlwifi: rs always set lq_sta->priv
iwlwifi: differentiate 4965 and 5000 hw ampdu queues number
iwlwifi: fix LED stall
iwlwifi: LED use correctly blink table
iwlwifi: unify 4965 and 5000 scanning code
iwlwifi: enable active scanning

Zhu Yi (1):
iwlwifi: send TXPOWER command after a new RXON command

Documentation/feature-removal-schedule.txt | 10 +
drivers/net/wireless/ath5k/base.c | 13 +-
drivers/net/wireless/b43/main.c | 48 ++--
drivers/net/wireless/b43/xmit.c | 3 +-
drivers/net/wireless/b43legacy/main.c | 45 ++--
drivers/net/wireless/b43legacy/xmit.c | 3 +-
drivers/net/wireless/iwlwifi/iwl-3945-led.c | 146 ++++------
drivers/net/wireless/iwlwifi/iwl-3945-led.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-3945.c | 50 ++--
drivers/net/wireless/iwlwifi/iwl-3945.h | 20 +--
drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 1 +
drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 2 -
drivers/net/wireless/iwlwifi/iwl-4965.c | 42 +++-
drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 1 +
drivers/net/wireless/iwlwifi/iwl-5000.c | 48 +++-
drivers/net/wireless/iwlwifi/iwl-commands.h | 30 ++-
drivers/net/wireless/iwlwifi/iwl-core.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-core.h | 5 +-
drivers/net/wireless/iwlwifi/iwl-dev.h | 27 +--
drivers/net/wireless/iwlwifi/iwl-led.c | 207 ++++++--------
drivers/net/wireless/iwlwifi/iwl-led.h | 5 +-
drivers/net/wireless/iwlwifi/iwl-rx.c | 37 ++--
drivers/net/wireless/iwlwifi/iwl-scan.c | 103 ++++----
drivers/net/wireless/iwlwifi/iwl-tx.c | 8 +-
drivers/net/wireless/iwlwifi/iwl3945-base.c | 145 +---------
drivers/net/wireless/iwlwifi/iwl4965-base.c | 108 ++++----
drivers/net/wireless/mac80211_hwsim.c | 2 +-
drivers/net/wireless/rt2x00/rt2400pci.c | 89 +++----
drivers/net/wireless/rt2x00/rt2500pci.c | 90 +++----
drivers/net/wireless/rt2x00/rt2500usb.c | 154 ++++------
drivers/net/wireless/rt2x00/rt2x00.h | 37 +---
drivers/net/wireless/rt2x00/rt2x00config.c | 2 +
drivers/net/wireless/rt2x00/rt2x00dev.c | 9 +-
drivers/net/wireless/rt2x00/rt2x00firmware.c | 8 +
drivers/net/wireless/rt2x00/rt2x00lib.h | 8 +
drivers/net/wireless/rt2x00/rt2x00mac.c | 40 ++-
drivers/net/wireless/rt2x00/rt2x00queue.c | 67 ++++-
drivers/net/wireless/rt2x00/rt61pci.c | 103 +++-----
drivers/net/wireless/rt2x00/rt73usb.c | 115 +++-----
drivers/net/wireless/rtl8187_dev.c | 23 +-
drivers/net/wireless/rtl8187_rtl8225.c | 21 ++-
drivers/net/wireless/rtl8187_rtl8225.h | 15 +-
drivers/net/wireless/zd1211rw/zd_mac.c | 22 +-
include/linux/ssb/ssb.h | 1 +
include/net/mac80211.h | 73 +++---
net/core/net-sysfs.c | 4 +-
net/mac80211/cfg.c | 36 +--
net/mac80211/debugfs.c | 15 +-
net/mac80211/debugfs_netdev.c | 48 ++--
net/mac80211/debugfs_netdev.h | 5 -
net/mac80211/ieee80211_i.h | 67 ++---
net/mac80211/iface.c | 392 +++++++++++---------------
net/mac80211/main.c | 171 ++++--------
net/mac80211/mlme.c | 172 +++++-------
net/mac80211/rc80211_pid_algo.c | 8 +-
net/mac80211/rx.c | 38 ++--
net/mac80211/sta_info.c | 29 ++-
net/mac80211/sta_info.h | 1 +
net/mac80211/tx.c | 126 +++++---
net/mac80211/util.c | 4 -
net/mac80211/wext.c | 65 +++--
net/wireless/Kconfig | 11 +
62 files changed, 1458 insertions(+), 1724 deletions(-)

Omnibus patch available here:

http://www.kernel.org/pub/linux/kernel/people/linville/wireless-next-2.6-2008-07-14.patch.bz2

--
John W. Linville
[email protected]


2008-07-15 16:25:11

by Randy Dunlap

[permalink] [raw]
Subject: Re: pull request: wireless-next-2.6 2008-07-14

On Tue, 15 Jul 2008 09:48:49 -0400 John W. Linville wrote:

> On Mon, Jul 14, 2008 at 01:29:18PM -0700, Randy Dunlap wrote:
> > On Mon, 14 Jul 2008 15:23:02 -0400 John W. Linville wrote:
> >
> > > Dave,
> > >
> > > Here is one last(?) round of miscellaneous patches I hope to get into
> > > 2.6.27. There are mostly driver updates, including a sizable iwlwifi
> > > set of changes.
> > >
> > > Please let me know if there are problems!
> >
> > Hi,
> > Dare I ask what happened to the mac80211 kernel-doc patch?
> >
> > Thanks,
> > ~Randy
>
> commit 6ef307bc561911c8cdda98ef3896b5982b602a43
> Author: Randy Dunlap <[email protected]>
> Date: Thu Jul 3 13:52:18 2008 -0700
>
> mac80211: fix lots of kernel-doc
>
> Fix more than 50 kernel-doc warnings in ieee80211/mac80211 kernel-doc notati
> Fix a few typos also.
>
> Note: Some fields are marked as TBD and need to have their description
> corrected.
>
> Signed-off-by: Randy Dunlap <[email protected]>
> Signed-off-by: John W. Linville <[email protected]>


Yes, that's in the wireless-next-2.6 git tree:
http://git.kernel.org/?p=linux/kernel/git/linville/wireless-next-2.6.git;a=commit;h=6ef307bc561911c8cdda98ef3896b5982b602a43

and this was a pull request, possibly even the last(?) pull, for wireless-next-2.6
for 2.6.27, according to the email intro. So please tell me what I can
expect for this mac80211 kernel-doc patch. Thanks.

---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/

2008-07-15 08:09:32

by Johannes Berg

[permalink] [raw]
Subject: [PATCH] wireless: fix warnings from QoS patch

When I removed the special "default" meaning from the QoS
parameters, I forgot to update drivers and this lead to
warnings because some drivers were checking for the special
values and putting in defaults. This fixes that by removing
the default special-casing completely.

Signed-off-by: Johannes Berg <[email protected]>
---
drivers/net/wireless/b43/main.c | 47 ++++----------------------------
drivers/net/wireless/rt2x00/rt2x00mac.c | 5 ---
2 files changed, 8 insertions(+), 44 deletions(-)

--- everything.orig/drivers/net/wireless/b43/main.c 2008-07-15 09:57:06.000000000 +0200
+++ everything/drivers/net/wireless/b43/main.c 2008-07-15 10:01:33.000000000 +0200
@@ -3073,53 +3073,20 @@ static void b43_qos_params_upload(struct
u16 shm_offset)
{
u16 params[B43_NR_QOSPARAMS];
- int cw_min, cw_max, aifs, bslots, tmp;
+ int bslots, tmp;
unsigned int i;

- const u16 aCWmin = 0x0001;
- const u16 aCWmax = 0x03FF;
-
- /* Calculate the default values for the parameters, if needed. */
- switch (shm_offset) {
- case B43_QOS_VOICE:
- aifs = (p->aifs == -1) ? 2 : p->aifs;
- cw_min = (p->cw_min == 0) ? ((aCWmin + 1) / 4 - 1) : p->cw_min;
- cw_max = (p->cw_max == 0) ? ((aCWmin + 1) / 2 - 1) : p->cw_max;
- break;
- case B43_QOS_VIDEO:
- aifs = (p->aifs == -1) ? 2 : p->aifs;
- cw_min = (p->cw_min == 0) ? ((aCWmin + 1) / 2 - 1) : p->cw_min;
- cw_max = (p->cw_max == 0) ? aCWmin : p->cw_max;
- break;
- case B43_QOS_BESTEFFORT:
- aifs = (p->aifs == -1) ? 3 : p->aifs;
- cw_min = (p->cw_min == 0) ? aCWmin : p->cw_min;
- cw_max = (p->cw_max == 0) ? aCWmax : p->cw_max;
- break;
- case B43_QOS_BACKGROUND:
- aifs = (p->aifs == -1) ? 7 : p->aifs;
- cw_min = (p->cw_min == 0) ? aCWmin : p->cw_min;
- cw_max = (p->cw_max == 0) ? aCWmax : p->cw_max;
- break;
- default:
- B43_WARN_ON(1);
- return;
- }
- if (cw_min <= 0)
- cw_min = aCWmin;
- if (cw_max <= 0)
- cw_max = aCWmin;
- bslots = b43_read16(dev, B43_MMIO_RNG) % cw_min;
+ bslots = b43_read16(dev, B43_MMIO_RNG) & p->cw_min;

memset(&params, 0, sizeof(params));

params[B43_QOSPARAM_TXOP] = p->txop * 32;
- params[B43_QOSPARAM_CWMIN] = cw_min;
- params[B43_QOSPARAM_CWMAX] = cw_max;
- params[B43_QOSPARAM_CWCUR] = cw_min;
- params[B43_QOSPARAM_AIFS] = aifs;
+ params[B43_QOSPARAM_CWMIN] = p->cw_min;
+ params[B43_QOSPARAM_CWMAX] = p->cw_max;
+ params[B43_QOSPARAM_CWCUR] = p->cw_min;
+ params[B43_QOSPARAM_AIFS] = p->aifs;
params[B43_QOSPARAM_BSLOTS] = bslots;
- params[B43_QOSPARAM_REGGAP] = bslots + aifs;
+ params[B43_QOSPARAM_REGGAP] = bslots + p->aifs;

for (i = 0; i < ARRAY_SIZE(params); i++) {
if (i == B43_QOSPARAM_STATUS) {
--- everything.orig/drivers/net/wireless/rt2x00/rt2x00mac.c 2008-07-15 10:02:02.000000000 +0200
+++ everything/drivers/net/wireless/rt2x00/rt2x00mac.c 2008-07-15 10:02:18.000000000 +0200
@@ -554,10 +554,7 @@ int rt2x00mac_conf_tx(struct ieee80211_h
else
queue->cw_max = 10; /* cw_min: 2^10 = 1024. */

- if (params->aifs >= 0)
- queue->aifs = params->aifs;
- else
- queue->aifs = 2;
+ queue->aifs = params->aifs;

INFO(rt2x00dev,
"Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d.\n",



2008-07-15 03:45:32

by David Miller

[permalink] [raw]
Subject: Re: pull request: wireless-next-2.6 2008-07-14

From: "John W. Linville" <[email protected]>
Date: Mon, 14 Jul 2008 15:23:02 -0400

> Here is one last(?) round of miscellaneous patches I hope to get into
> 2.6.27. There are mostly driver updates, including a sizable iwlwifi
> set of changes.
>
> Please let me know if there are problems!

Pulled into net-next-2.6, thanks John.

If someone could fix the following wireless warnings I'd appreciate
it.

Thanks!

drivers/net/wireless/rt2x00/rt2x00mac.c: In function 'rt2x00mac_conf_tx':
drivers/net/wireless/rt2x00/rt2x00mac.c:557: warning: comparison is always true due to limited range of data type
drivers/net/wireless/b43/main.c: In function 'b43_qos_params_upload':
drivers/net/wireless/b43/main.c:3085: warning: comparison is always false due to limited range of data type
drivers/net/wireless/b43/main.c:3090: warning: comparison is always false due to limited range of data type
drivers/net/wireless/b43/main.c:3095: warning: comparison is always false due to limited range of data type
drivers/net/wireless/b43/main.c:3100: warning: comparison is always false due to limited range of data type
drivers/net/wireless/iwlwifi/iwl-led.c: In function 'iwl_get_blink_rate':
drivers/net/wireless/iwlwifi/iwl-led.c:271: warning: format '%lld' expects type 'long long int', but argument 6 has type 's64'
drivers/net/wireless/iwlwifi/iwl-led.c:271: warning: format '%lld' expects type 'long long int', but argument 7 has type 'u64'

2008-07-15 14:18:51

by John W. Linville

[permalink] [raw]
Subject: Re: pull request: wireless-next-2.6 2008-07-14

On Mon, Jul 14, 2008 at 01:29:18PM -0700, Randy Dunlap wrote:
> On Mon, 14 Jul 2008 15:23:02 -0400 John W. Linville wrote:
>
> > Dave,
> >
> > Here is one last(?) round of miscellaneous patches I hope to get into
> > 2.6.27. There are mostly driver updates, including a sizable iwlwifi
> > set of changes.
> >
> > Please let me know if there are problems!
>
> Hi,
> Dare I ask what happened to the mac80211 kernel-doc patch?
>
> Thanks,
> ~Randy

commit 6ef307bc561911c8cdda98ef3896b5982b602a43
Author: Randy Dunlap <[email protected]>
Date: Thu Jul 3 13:52:18 2008 -0700

mac80211: fix lots of kernel-doc

Fix more than 50 kernel-doc warnings in ieee80211/mac80211 kernel-doc notati
Fix a few typos also.

Note: Some fields are marked as TBD and need to have their description
corrected.

Signed-off-by: Randy Dunlap <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

--
John W. Linville
[email protected]

2008-07-16 20:31:15

by John W. Linville

[permalink] [raw]
Subject: Re: pull request: wireless-next-2.6 2008-07-14

On Wed, Jul 16, 2008 at 01:00:07PM -0700, David Miller wrote:
> From: "Tomas Winkler" <[email protected]>
> Date: Wed, 16 Jul 2008 15:49:34 +0300
>
> > On Tue, Jul 15, 2008 at 6:45 AM, David Miller <[email protected]> wrote:
> > > From: "John W. Linville" <[email protected]>
> > > Date: Mon, 14 Jul 2008 15:23:02 -0400
> > >
> > > drivers/net/wireless/iwlwifi/iwl-led.c:271: warning: format '%lld' expects type 'long long int', but argument 6 has type 's64'
> > > drivers/net/wireless/iwlwifi/iwl-led.c:271: warning: format '%lld' expects type 'long long int', but argument 7 has type 'u64'
> >
> > I cannot reproduce this. Wasn't this conversion already solved or
> > still need to cast to long long int?
>
> You have to cast u64/s64 values to long long if you want to print them
> using %llX specifiers, because some 64-bit platforms define these
> types as plain "long".

There were a number of such warnings fixed in iwlwifi previously.
It is possible that either one got lost in a merge conflict or this
new one simply is reminding Tomas of one of the old ones. Either way,
it seems to be fixed now.

John
--
John W. Linville
[email protected]

2008-07-16 12:49:35

by Tomas Winkler

[permalink] [raw]
Subject: Re: pull request: wireless-next-2.6 2008-07-14

On Tue, Jul 15, 2008 at 6:45 AM, David Miller <[email protected]> wrote:
> From: "John W. Linville" <[email protected]>
> Date: Mon, 14 Jul 2008 15:23:02 -0400
>
>> Here is one last(?) round of miscellaneous patches I hope to get into
>> 2.6.27. There are mostly driver updates, including a sizable iwlwifi
>> set of changes.
>>
>> Please let me know if there are problems!
>
> Pulled into net-next-2.6, thanks John.
>
> If someone could fix the following wireless warnings I'd appreciate
> it.
>
> Thanks!
>

> drivers/net/wireless/iwlwifi/iwl-led.c:271: warning: format '%lld' expects type 'long long int', but argument 6 has type 's64'
> drivers/net/wireless/iwlwifi/iwl-led.c:271: warning: format '%lld' expects type 'long long int', but argument 7 has type 'u64'

I cannot reproduce this. Wasn't this conversion already solved or
still need to cast to long long int?
Tomas

2008-07-16 20:00:09

by David Miller

[permalink] [raw]
Subject: Re: pull request: wireless-next-2.6 2008-07-14

From: "Tomas Winkler" <[email protected]>
Date: Wed, 16 Jul 2008 15:49:34 +0300

> On Tue, Jul 15, 2008 at 6:45 AM, David Miller <[email protected]> wrote:
> > From: "John W. Linville" <[email protected]>
> > Date: Mon, 14 Jul 2008 15:23:02 -0400
> >
> > drivers/net/wireless/iwlwifi/iwl-led.c:271: warning: format '%lld' expects type 'long long int', but argument 6 has type 's64'
> > drivers/net/wireless/iwlwifi/iwl-led.c:271: warning: format '%lld' expects type 'long long int', but argument 7 has type 'u64'
>
> I cannot reproduce this. Wasn't this conversion already solved or
> still need to cast to long long int?

You have to cast u64/s64 values to long long if you want to print them
using %llX specifiers, because some 64-bit platforms define these
types as plain "long".

2008-07-14 20:30:26

by Randy Dunlap

[permalink] [raw]
Subject: Re: pull request: wireless-next-2.6 2008-07-14

On Mon, 14 Jul 2008 15:23:02 -0400 John W. Linville wrote:

> Dave,
>
> Here is one last(?) round of miscellaneous patches I hope to get into
> 2.6.27. There are mostly driver updates, including a sizable iwlwifi
> set of changes.
>
> Please let me know if there are problems!

Hi,
Dare I ask what happened to the mac80211 kernel-doc patch?

Thanks,
~Randy


> Thanks,
>
> John
>
> ---
>
> Individual patches are available here:
>
> http://www.kernel.org/pub/linux/kernel/people/linville/wireless-next-2.6/
>
> ---
>
> The following changes since commit 79d16385c7f287a33ea771c4dbe60ae43f791b49:
> David S. Miller (1):
> netdev: Move atomic queue state bits into netdev_queue.
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git master
>
> Abhijeet Kolekar (2):
> iwlwifi: Fix LEDs for 3945
> iwlwifi: make index unsigned int for iwl_send_led_cmd
>
> Adel Gadllah (1):
> iwl3965: remove useless network and duplicate checking
>
> Emmanuel Grumbach (4):
> mac80211: Fix ieee80211_rx_reorder_ampdu: ignore QoS null packets
> mac80211: dont add a STA which is not in the same IBSS
> iwlwifi: fixes RTS / CTS support
> iwlwifi: make iwl4965_mac_conf_tx in atomic context
>
> Esti Kummer (1):
> iwlwifi: adding pci device ids to iwl_hw_card_ids
>
> Herton Ronaldo Krzesinski (1):
> rtl8187: use different ANAPARAM*_OFF values for 8187B
>
> Ihar Hrachyshka (1):
> rtl8187: Fixed section mismatch in rtl8187_dev.c
>
> Ivo van Doorn (4):
> rt2x00: Fix NULL pointer error in adhoc/master mode
> rt2x00: Add support for CTS protection in rt2x00lib
> rt2x00: Reorganize beacon handling
> rt2x00: Reset LED assoc status after firmware update
>
> Johannes Berg (9):
> mac80211: make master netdev handling sane
> mac80211: revamp virtual interface handling
> mac80211: push interface checks down
> mac80211: revamp beacon configuration
> mac80211: fix RX sequence number check
> wext: make sysfs bits optional and deprecate them
> mac80211: fix TX sequence numbers
> mac80211: fix struct ieee80211_tx_queue_params
> mac80211 hwsim: fix endianness bug
>
> Michael Buesch (1):
> ssb: Include dma-mapping.h
>
> Samuel Ortiz (1):
> mac80211: power management wext hooks
>
> Tomas Winkler (8):
> iwlwif: remove compilation warnings iwl_add_radiotap
> iwlwifi: remove post associate work
> iwlwifi: rs always set lq_sta->priv
> iwlwifi: differentiate 4965 and 5000 hw ampdu queues number
> iwlwifi: fix LED stall
> iwlwifi: LED use correctly blink table
> iwlwifi: unify 4965 and 5000 scanning code
> iwlwifi: enable active scanning
>
> Zhu Yi (1):
> iwlwifi: send TXPOWER command after a new RXON command
>
> Documentation/feature-removal-schedule.txt | 10 +
> drivers/net/wireless/ath5k/base.c | 13 +-
> drivers/net/wireless/b43/main.c | 48 ++--
> drivers/net/wireless/b43/xmit.c | 3 +-
> drivers/net/wireless/b43legacy/main.c | 45 ++--
> drivers/net/wireless/b43legacy/xmit.c | 3 +-
> drivers/net/wireless/iwlwifi/iwl-3945-led.c | 146 ++++------
> drivers/net/wireless/iwlwifi/iwl-3945-led.h | 2 +-
> drivers/net/wireless/iwlwifi/iwl-3945.c | 50 ++--
> drivers/net/wireless/iwlwifi/iwl-3945.h | 20 +--
> drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 1 +
> drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 2 -
> drivers/net/wireless/iwlwifi/iwl-4965.c | 42 +++-
> drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 1 +
> drivers/net/wireless/iwlwifi/iwl-5000.c | 48 +++-
> drivers/net/wireless/iwlwifi/iwl-commands.h | 30 ++-
> drivers/net/wireless/iwlwifi/iwl-core.c | 2 +-
> drivers/net/wireless/iwlwifi/iwl-core.h | 5 +-
> drivers/net/wireless/iwlwifi/iwl-dev.h | 27 +--
> drivers/net/wireless/iwlwifi/iwl-led.c | 207 ++++++--------
> drivers/net/wireless/iwlwifi/iwl-led.h | 5 +-
> drivers/net/wireless/iwlwifi/iwl-rx.c | 37 ++--
> drivers/net/wireless/iwlwifi/iwl-scan.c | 103 ++++----
> drivers/net/wireless/iwlwifi/iwl-tx.c | 8 +-
> drivers/net/wireless/iwlwifi/iwl3945-base.c | 145 +---------
> drivers/net/wireless/iwlwifi/iwl4965-base.c | 108 ++++----
> drivers/net/wireless/mac80211_hwsim.c | 2 +-
> drivers/net/wireless/rt2x00/rt2400pci.c | 89 +++----
> drivers/net/wireless/rt2x00/rt2500pci.c | 90 +++----
> drivers/net/wireless/rt2x00/rt2500usb.c | 154 ++++------
> drivers/net/wireless/rt2x00/rt2x00.h | 37 +---
> drivers/net/wireless/rt2x00/rt2x00config.c | 2 +
> drivers/net/wireless/rt2x00/rt2x00dev.c | 9 +-
> drivers/net/wireless/rt2x00/rt2x00firmware.c | 8 +
> drivers/net/wireless/rt2x00/rt2x00lib.h | 8 +
> drivers/net/wireless/rt2x00/rt2x00mac.c | 40 ++-
> drivers/net/wireless/rt2x00/rt2x00queue.c | 67 ++++-
> drivers/net/wireless/rt2x00/rt61pci.c | 103 +++-----
> drivers/net/wireless/rt2x00/rt73usb.c | 115 +++-----
> drivers/net/wireless/rtl8187_dev.c | 23 +-
> drivers/net/wireless/rtl8187_rtl8225.c | 21 ++-
> drivers/net/wireless/rtl8187_rtl8225.h | 15 +-
> drivers/net/wireless/zd1211rw/zd_mac.c | 22 +-
> include/linux/ssb/ssb.h | 1 +
> include/net/mac80211.h | 73 +++---
> net/core/net-sysfs.c | 4 +-
> net/mac80211/cfg.c | 36 +--
> net/mac80211/debugfs.c | 15 +-
> net/mac80211/debugfs_netdev.c | 48 ++--
> net/mac80211/debugfs_netdev.h | 5 -
> net/mac80211/ieee80211_i.h | 67 ++---
> net/mac80211/iface.c | 392 +++++++++++---------------
> net/mac80211/main.c | 171 ++++--------
> net/mac80211/mlme.c | 172 +++++-------
> net/mac80211/rc80211_pid_algo.c | 8 +-
> net/mac80211/rx.c | 38 ++--
> net/mac80211/sta_info.c | 29 ++-
> net/mac80211/sta_info.h | 1 +
> net/mac80211/tx.c | 126 +++++---
> net/mac80211/util.c | 4 -
> net/mac80211/wext.c | 65 +++--
> net/wireless/Kconfig | 11 +
> 62 files changed, 1458 insertions(+), 1724 deletions(-)
>
> Omnibus patch available here:
>
> http://www.kernel.org/pub/linux/kernel/people/linville/wireless-next-2.6-2008-07-14.patch.bz2


---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/

2008-07-15 17:08:43

by John W. Linville

[permalink] [raw]
Subject: Re: pull request: wireless-next-2.6 2008-07-14

On Tue, Jul 15, 2008 at 09:24:31AM -0700, Randy Dunlap wrote:
> On Tue, 15 Jul 2008 09:48:49 -0400 John W. Linville wrote:

> > commit 6ef307bc561911c8cdda98ef3896b5982b602a43
> > Author: Randy Dunlap <[email protected]>
> > Date: Thu Jul 3 13:52:18 2008 -0700
> >
> > mac80211: fix lots of kernel-doc
> >
> > Fix more than 50 kernel-doc warnings in ieee80211/mac80211 kernel-doc notati
> > Fix a few typos also.
> >
> > Note: Some fields are marked as TBD and need to have their description
> > corrected.
> >
> > Signed-off-by: Randy Dunlap <[email protected]>
> > Signed-off-by: John W. Linville <[email protected]>
>
>
> Yes, that's in the wireless-next-2.6 git tree:
> http://git.kernel.org/?p=linux/kernel/git/linville/wireless-next-2.6.git;a=commit;h=6ef307bc561911c8cdda98ef3896b5982b602a43
>
> and this was a pull request, possibly even the last(?) pull, for wireless-next-2.6
> for 2.6.27, according to the email intro. So please tell me what I can
> expect for this mac80211 kernel-doc patch. Thanks.

We spoke off-line, but just for the public record that commit was
already pulled into net-next-2.6.

Hth!

John
--
John W. Linville
[email protected]

2008-07-15 07:43:38

by Johannes Berg

[permalink] [raw]
Subject: Re: pull request: wireless-next-2.6 2008-07-14


> drivers/net/wireless/rt2x00/rt2x00mac.c: In function 'rt2x00mac_conf_tx':
> drivers/net/wireless/rt2x00/rt2x00mac.c:557: warning: comparison is always true due to limited range of data type
> drivers/net/wireless/b43/main.c: In function 'b43_qos_params_upload':
> drivers/net/wireless/b43/main.c:3085: warning: comparison is always false due to limited range of data type
> drivers/net/wireless/b43/main.c:3090: warning: comparison is always false due to limited range of data type
> drivers/net/wireless/b43/main.c:3095: warning: comparison is always false due to limited range of data type
> drivers/net/wireless/b43/main.c:3100: warning: comparison is always false due to limited range of data type

Sorry, those sprung up because I made an API variable unsigned that
never was negative, I'll fix it.

johannes


Attachments:
signature.asc (836.00 B)
This is a digitally signed message part

2008-07-15 09:09:23

by David Miller

[permalink] [raw]
Subject: Re: [PATCH] wireless: fix warnings from QoS patch

From: Johannes Berg <[email protected]>
Date: Tue, 15 Jul 2008 10:09:24 +0200

> When I removed the special "default" meaning from the QoS
> parameters, I forgot to update drivers and this lead to
> warnings because some drivers were checking for the special
> values and putting in defaults. This fixes that by removing
> the default special-casing completely.
>
> Signed-off-by: Johannes Berg <[email protected]>

Applied, thanks for fixing this so fast Johannes.