Send users mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://rt2x00.serialmonkey.com/mailman/listinfo/users_rt2x00.serialmonkey.com
or, via email, send a message with subject or body 'help' to
[email protected]
You can reach the person managing the list at
[email protected]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of users digest..."
Today's Topics:
1. Re: Fwd: linux-image-3.1.0-1-amd64: Can't switch off WoW
option of RT5390 wi-fi card, notebook wakes on wi-fi activity
(Helmut Schaa)
2. Re: Fwd: linux-image-3.1.0-1-amd64: Can't switch off WoW
option of RT5390 wi-fi card, notebook wakes on wi-fi activity
(Gertjan van Wingerde)
3. Re: [PATCH 1/7] rt2x00: Identify rt2800usb chipsets.
(Ivo Van Doorn)
4. Re: [PATCH 2/7] rt2x00: Whitespace cleanup. (Ivo Van Doorn)
5. Re: [PATCH 3/7] rt2x00: Convert big if-statements to
switch-statements. (Ivo Van Doorn)
6. Re: [PATCH 4/7] rt2800usb: Let rt2x00usb handle USB padding
(Ivo Van Doorn)
----------------------------------------------------------------------
Message: 1
Date: Wed, 28 Dec 2011 08:56:04 +0100
From: Helmut Schaa <[email protected]>
To: [email protected]
Cc: [email protected], pol kh <[email protected]>,
[email protected]
Subject: Re: [rt2x00-users] Fwd: linux-image-3.1.0-1-amd64: Can't
switch off WoW option of RT5390 wi-fi card, notebook wakes on wi-fi
activity
Message-ID: <[email protected]>
Content-Type: text/plain; charset="koi8-r"
Hi,
Am Sonntag, 25. Dezember 2011, 09:07:42 schrieb pol kh:
> I'd like to be able to manage WoW option on Ralink 5390 on my HP Pavilion
> dv6-6030er. WoW is enabled by default in BIOS, which is locked by vendor.
> So I can't switch it off. Using ethtool doesn't help, because driver can't
> hanlder with WoW. My notebook wakes on wi-fi activity when I'd like it to
> be asleep. I had sent a bug report to Debian GNU/Linux maintainers and got
> the following answer (below my bug report is attached):
this sounds really strange :). Unfortunately nobody is working on WoW support
for rt2x00 currently.
Ivo, Gertjan, do we have any information yet how WoW for the ralink devices
is supposed to work? Since the WoW framework was already merged AFAIK it might
be a trivial thing to add ...
Helmut
------------------------------
Message: 2
Date: Wed, 28 Dec 2011 12:09:27 +0100
From: Gertjan van Wingerde <[email protected]>
To: Helmut Schaa <[email protected]>
Cc: [email protected], pol kh <[email protected]>,
[email protected], [email protected]
Subject: Re: [rt2x00-users] Fwd: linux-image-3.1.0-1-amd64: Can't
switch off WoW option of RT5390 wi-fi card, notebook wakes on wi-fi
activity
Message-ID: <[email protected]>
Content-Type: text/plain; charset=ISO-8859-1
On 12/28/11 08:56, Helmut Schaa wrote:
> Hi,
>
> Am Sonntag, 25. Dezember 2011, 09:07:42 schrieb pol kh:
>> I'd like to be able to manage WoW option on Ralink 5390 on my HP Pavilion
>> dv6-6030er. WoW is enabled by default in BIOS, which is locked by vendor.
>> So I can't switch it off. Using ethtool doesn't help, because driver can't
>> hanlder with WoW. My notebook wakes on wi-fi activity when I'd like it to
>> be asleep. I had sent a bug report to Debian GNU/Linux maintainers and got
>> the following answer (below my bug report is attached):
>
> this sounds really strange :). Unfortunately nobody is working on WoW support
> for rt2x00 currently.
>
> Ivo, Gertjan, do we have any information yet how WoW for the ralink devices
> is supposed to work? Since the WoW framework was already merged AFAIK it might
> be a trivial thing to add ...
No, I've never seen any information about this.
A quick look at the Ralink legacy drivers also reveal that these do not
contain any code for this, so it will be difficult to add support for
this in rt2x00.
---
Gertjan
------------------------------
Message: 3
Date: Wed, 28 Dec 2011 21:10:32 +0100
From: Ivo Van Doorn <[email protected]>
To: Gertjan van Wingerde <[email protected]>
Cc: [email protected], [email protected]
Subject: Re: [rt2x00-users] [PATCH 1/7] rt2x00: Identify rt2800usb
chipsets.
Message-ID:
<CAOZOX0U=huksz-4ppdwoa9ipkjksewguq-j7zszewvfq_sc...@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
On Wed, Dec 28, 2011 at 1:53 AM, Gertjan van Wingerde
<[email protected]> wrote:
> According to the latest USB ID database these are all RT2770 / RT2870 / RT307x
> devices.
>
> Signed-off-by: Gertjan van Wingerde <[email protected]>
Acked-by: Ivo van Doorn <[email protected]>
> ---
> ?drivers/net/wireless/rt2x00/rt2800usb.c | ? 26 ++++++++++++--------------
> ?1 files changed, 12 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c
> b/drivers/net/wireless/rt2x00/rt2800usb.c
> index 3265b34..313cc7f 100644
> --- a/drivers/net/wireless/rt2x00/rt2800usb.c
> +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
> @@ -914,12 +914,14 @@ static struct usb_device_id rt2800usb_device_table[] = {
> ? ? ? ?{ USB_DEVICE(0x050d, 0x8053) },
> ? ? ? ?{ USB_DEVICE(0x050d, 0x805c) },
> ? ? ? ?{ USB_DEVICE(0x050d, 0x815c) },
> + ? ? ? { USB_DEVICE(0x050d, 0x825a) },
> ? ? ? ?{ USB_DEVICE(0x050d, 0x825b) },
> ? ? ? ?{ USB_DEVICE(0x050d, 0x935a) },
> ? ? ? ?{ USB_DEVICE(0x050d, 0x935b) },
> ? ? ? ?/* Buffalo */
> ? ? ? ?{ USB_DEVICE(0x0411, 0x00e8) },
> ? ? ? ?{ USB_DEVICE(0x0411, 0x0158) },
> + ? ? ? { USB_DEVICE(0x0411, 0x015d) },
> ? ? ? ?{ USB_DEVICE(0x0411, 0x016f) },
> ? ? ? ?{ USB_DEVICE(0x0411, 0x01a2) },
> ? ? ? ?/* Corega */
> @@ -934,6 +936,8 @@ static struct usb_device_id rt2800usb_device_table[] = {
> ? ? ? ?{ USB_DEVICE(0x07d1, 0x3c0e) },
> ? ? ? ?{ USB_DEVICE(0x07d1, 0x3c0f) },
> ? ? ? ?{ USB_DEVICE(0x07d1, 0x3c11) },
> + ? ? ? { USB_DEVICE(0x07d1, 0x3c13) },
> + ? ? ? { USB_DEVICE(0x07d1, 0x3c15) },
> ? ? ? ?{ USB_DEVICE(0x07d1, 0x3c16) },
> ? ? ? ?/* Draytek */
> ? ? ? ?{ USB_DEVICE(0x07fa, 0x7712) },
> @@ -943,6 +947,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
> ? ? ? ?{ USB_DEVICE(0x7392, 0x7711) },
> ? ? ? ?{ USB_DEVICE(0x7392, 0x7717) },
> ? ? ? ?{ USB_DEVICE(0x7392, 0x7718) },
> + ? ? ? { USB_DEVICE(0x7392, 0x7722) },
> ? ? ? ?/* Encore */
> ? ? ? ?{ USB_DEVICE(0x203d, 0x1480) },
> ? ? ? ?{ USB_DEVICE(0x203d, 0x14a9) },
> @@ -977,6 +982,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
> ? ? ? ?{ USB_DEVICE(0x1737, 0x0070) },
> ? ? ? ?{ USB_DEVICE(0x1737, 0x0071) },
> ? ? ? ?{ USB_DEVICE(0x1737, 0x0077) },
> + ? ? ? { USB_DEVICE(0x1737, 0x0078) },
> ? ? ? ?/* Logitec */
> ? ? ? ?{ USB_DEVICE(0x0789, 0x0162) },
> ? ? ? ?{ USB_DEVICE(0x0789, 0x0163) },
> @@ -1000,9 +1006,13 @@ static struct usb_device_id rt2800usb_device_table[] =
> {
> ? ? ? ?{ USB_DEVICE(0x0db0, 0x871b) },
> ? ? ? ?{ USB_DEVICE(0x0db0, 0x871c) },
> ? ? ? ?{ USB_DEVICE(0x0db0, 0x899a) },
> + ? ? ? /* Ovislink */
> + ? ? ? { USB_DEVICE(0x1b75, 0x3071) },
> + ? ? ? { USB_DEVICE(0x1b75, 0x3072) },
> ? ? ? ?/* Para */
> ? ? ? ?{ USB_DEVICE(0x20b8, 0x8888) },
> ? ? ? ?/* Pegatron */
> + ? ? ? { USB_DEVICE(0x1d4d, 0x0002) },
> ? ? ? ?{ USB_DEVICE(0x1d4d, 0x000c) },
> ? ? ? ?{ USB_DEVICE(0x1d4d, 0x000e) },
> ? ? ? ?{ USB_DEVICE(0x1d4d, 0x0011) },
> @@ -1055,7 +1065,9 @@ static struct usb_device_id rt2800usb_device_table[] = {
> ? ? ? ?/* Sparklan */
> ? ? ? ?{ USB_DEVICE(0x15a9, 0x0006) },
> ? ? ? ?/* Sweex */
> + ? ? ? { USB_DEVICE(0x177f, 0x0153) },
> ? ? ? ?{ USB_DEVICE(0x177f, 0x0302) },
> + ? ? ? { USB_DEVICE(0x177f, 0x0313) },
> ? ? ? ?/* U-Media */
> ? ? ? ?{ USB_DEVICE(0x157e, 0x300e) },
> ? ? ? ?{ USB_DEVICE(0x157e, 0x3013) },
> @@ -1139,25 +1151,20 @@ static struct usb_device_id rt2800usb_device_table[]
> = {
> ? ? ? ?{ USB_DEVICE(0x13d3, 0x3322) },
> ? ? ? ?/* Belkin */
> ? ? ? ?{ USB_DEVICE(0x050d, 0x1003) },
> - ? ? ? { USB_DEVICE(0x050d, 0x825a) },
> ? ? ? ?/* Buffalo */
> ? ? ? ?{ USB_DEVICE(0x0411, 0x012e) },
> ? ? ? ?{ USB_DEVICE(0x0411, 0x0148) },
> ? ? ? ?{ USB_DEVICE(0x0411, 0x0150) },
> - ? ? ? { USB_DEVICE(0x0411, 0x015d) },
> ? ? ? ?/* Corega */
> ? ? ? ?{ USB_DEVICE(0x07aa, 0x0041) },
> ? ? ? ?{ USB_DEVICE(0x07aa, 0x0042) },
> ? ? ? ?{ USB_DEVICE(0x18c5, 0x0008) },
> ? ? ? ?/* D-Link */
> ? ? ? ?{ USB_DEVICE(0x07d1, 0x3c0b) },
> - ? ? ? { USB_DEVICE(0x07d1, 0x3c13) },
> - ? ? ? { USB_DEVICE(0x07d1, 0x3c15) },
> ? ? ? ?{ USB_DEVICE(0x07d1, 0x3c17) },
> ? ? ? ?{ USB_DEVICE(0x2001, 0x3c17) },
> ? ? ? ?/* Edimax */
> ? ? ? ?{ USB_DEVICE(0x7392, 0x4085) },
> - ? ? ? { USB_DEVICE(0x7392, 0x7722) },
> ? ? ? ?/* Encore */
> ? ? ? ?{ USB_DEVICE(0x203d, 0x14a1) },
> ? ? ? ?/* Gemtek */
> @@ -1171,19 +1178,13 @@ static struct usb_device_id rt2800usb_device_table[]
> = {
> ? ? ? ?/* LevelOne */
> ? ? ? ?{ USB_DEVICE(0x1740, 0x0605) },
> ? ? ? ?{ USB_DEVICE(0x1740, 0x0615) },
> - ? ? ? /* Linksys */
> - ? ? ? { USB_DEVICE(0x1737, 0x0078) },
> ? ? ? ?/* Logitec */
> ? ? ? ?{ USB_DEVICE(0x0789, 0x0168) },
> ? ? ? ?{ USB_DEVICE(0x0789, 0x0169) },
> ? ? ? ?/* Motorola */
> ? ? ? ?{ USB_DEVICE(0x100d, 0x9032) },
> - ? ? ? /* Ovislink */
> - ? ? ? { USB_DEVICE(0x1b75, 0x3071) },
> - ? ? ? { USB_DEVICE(0x1b75, 0x3072) },
> ? ? ? ?/* Pegatron */
> ? ? ? ?{ USB_DEVICE(0x05a6, 0x0101) },
> - ? ? ? { USB_DEVICE(0x1d4d, 0x0002) },
> ? ? ? ?{ USB_DEVICE(0x1d4d, 0x0010) },
> ? ? ? ?/* Planex */
> ? ? ? ?{ USB_DEVICE(0x2019, 0x5201) },
> @@ -1202,9 +1203,6 @@ static struct usb_device_id rt2800usb_device_table[] = {
> ? ? ? ?{ USB_DEVICE(0x083a, 0xc522) },
> ? ? ? ?{ USB_DEVICE(0x083a, 0xd522) },
> ? ? ? ?{ USB_DEVICE(0x083a, 0xf511) },
> - ? ? ? /* Sweex */
> - ? ? ? { USB_DEVICE(0x177f, 0x0153) },
> - ? ? ? { USB_DEVICE(0x177f, 0x0313) },
> ? ? ? ?/* Zyxel */
> ? ? ? ?{ USB_DEVICE(0x0586, 0x341a) },
> ?#endif
> --
> 1.7.7.4
>
------------------------------
Message: 4
Date: Wed, 28 Dec 2011 21:10:55 +0100
From: Ivo Van Doorn <[email protected]>
To: Gertjan van Wingerde <[email protected]>
Cc: [email protected], [email protected]
Subject: Re: [rt2x00-users] [PATCH 2/7] rt2x00: Whitespace cleanup.
Message-ID:
<CAOZOX0VhJ9wLHEsUa=p00tho-38jwkylyjg9dxq+vtcoa9d...@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
On Wed, Dec 28, 2011 at 1:53 AM, Gertjan van Wingerde
<[email protected]> wrote:
> Signed-off-by: Gertjan van Wingerde <[email protected]>
Acked-by: Ivo van Doorn <[email protected]>
> ---
> ?drivers/net/wireless/rt2x00/rt2x00.h | ? ?2 +-
> ?1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2x00.h
> b/drivers/net/wireless/rt2x00/rt2x00.h
> index 99ff12d..851b717 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00.h
> @@ -191,7 +191,7 @@ struct rt2x00_chip {
> ?#define RT3572 ? ? ? ? 0x3572
> ?#define RT3593 ? ? ? ? 0x3593 ?/* PCIe */
> ?#define RT3883 ? ? ? ? 0x3883 ?/* WSOC */
> -#define RT5390 ? ? ? ? 0x5390 ?/* 2.4GHz */
> +#define RT5390 ? ? ? ? 0x5390 ?/* 2.4GHz */
>
> ? ? ? ?u16 rf;
> ? ? ? ?u16 rev;
> --
> 1.7.7.4
>
------------------------------
Message: 5
Date: Wed, 28 Dec 2011 21:11:31 +0100
From: Ivo Van Doorn <[email protected]>
To: Gertjan van Wingerde <[email protected]>
Cc: [email protected], [email protected]
Subject: Re: [rt2x00-users] [PATCH 3/7] rt2x00: Convert big
if-statements to switch-statements.
Message-ID:
<CAOZOX0UW27EbRFr4xk87pOSpSbgiifOvaAKBex1J9m87gV=e=a...@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
On Wed, Dec 28, 2011 at 1:53 AM, Gertjan van Wingerde
<[email protected]> wrote:
> Signed-off-by: Gertjan van Wingerde <[email protected]>
Acked-by: Ivo van Doorn <[email protected]>
PS. Is this something that can be done for the other drivers as well?
> ---
> ?drivers/net/wireless/rt2x00/rt2800lib.c | ? 44 ++++++++++++++++++------------
> ?1 files changed, 26 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c
> b/drivers/net/wireless/rt2x00/rt2800lib.c
> index e5df380..5b0137c 100644
> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
> @@ -1944,19 +1944,24 @@ static void rt2800_config_channel(struct rt2x00_dev
> *rt2x00dev,
> ? ? ? ? ? ? ? ?info->default_power2 = TXPOWER_A_TO_DEV(info->default_power2);
> ? ? ? ?}
>
> - ? ? ? if (rt2x00_rf(rt2x00dev, RF2020) ||
> - ? ? ? ? ? rt2x00_rf(rt2x00dev, RF3020) ||
> - ? ? ? ? ? rt2x00_rf(rt2x00dev, RF3021) ||
> - ? ? ? ? ? rt2x00_rf(rt2x00dev, RF3022) ||
> - ? ? ? ? ? rt2x00_rf(rt2x00dev, RF3320))
> + ? ? ? switch (rt2x00dev->chip.rf) {
> + ? ? ? case RF2020:
> + ? ? ? case RF3020:
> + ? ? ? case RF3021:
> + ? ? ? case RF3022:
> + ? ? ? case RF3320:
> ? ? ? ? ? ? ? ?rt2800_config_channel_rf3xxx(rt2x00dev, conf, rf, info);
> - ? ? ? else if (rt2x00_rf(rt2x00dev, RF3052))
> + ? ? ? ? ? ? ? break;
> + ? ? ? case RF3052:
> ? ? ? ? ? ? ? ?rt2800_config_channel_rf3052(rt2x00dev, conf, rf, info);
> - ? ? ? else if (rt2x00_rf(rt2x00dev, RF5370) ||
> - ? ? ? ? ? ? ? ?rt2x00_rf(rt2x00dev, RF5390))
> + ? ? ? ? ? ? ? break;
> + ? ? ? case RF5370:
> + ? ? ? case RF5390:
> ? ? ? ? ? ? ? ?rt2800_config_channel_rf53xx(rt2x00dev, conf, rf, info);
> - ? ? ? else
> + ? ? ? ? ? ? ? break;
> + ? ? ? default:
> ? ? ? ? ? ? ? ?rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);
> + ? ? ? }
>
> ? ? ? ?/*
> ? ? ? ? * Change BBP settings
> @@ -3932,15 +3937,18 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
> ? ? ? ?rt2x00_set_chip(rt2x00dev, rt2x00_get_field32(reg, MAC_CSR0_CHIPSET),
> ? ? ? ? ? ? ? ? ? ? ? ?value, rt2x00_get_field32(reg, MAC_CSR0_REVISION));
>
> - ? ? ? if (!rt2x00_rt(rt2x00dev, RT2860) &&
> - ? ? ? ? ? !rt2x00_rt(rt2x00dev, RT2872) &&
> - ? ? ? ? ? !rt2x00_rt(rt2x00dev, RT2883) &&
> - ? ? ? ? ? !rt2x00_rt(rt2x00dev, RT3070) &&
> - ? ? ? ? ? !rt2x00_rt(rt2x00dev, RT3071) &&
> - ? ? ? ? ? !rt2x00_rt(rt2x00dev, RT3090) &&
> - ? ? ? ? ? !rt2x00_rt(rt2x00dev, RT3390) &&
> - ? ? ? ? ? !rt2x00_rt(rt2x00dev, RT3572) &&
> - ? ? ? ? ? !rt2x00_rt(rt2x00dev, RT5390)) {
> + ? ? ? switch (rt2x00dev->chip.rt) {
> + ? ? ? case RT2860:
> + ? ? ? case RT2872:
> + ? ? ? case RT2883:
> + ? ? ? case RT3070:
> + ? ? ? case RT3071:
> + ? ? ? case RT3090:
> + ? ? ? case RT3390:
> + ? ? ? case RT3572:
> + ? ? ? case RT5390:
> + ? ? ? ? ? ? ? break;
> + ? ? ? default:
> ? ? ? ? ? ? ? ?ERROR(rt2x00dev, "Invalid RT chipset detected.\n");
> ? ? ? ? ? ? ? ?return -ENODEV;
> ? ? ? ?}
> --
> 1.7.7.4
>
------------------------------
Message: 6
Date: Wed, 28 Dec 2011 21:12:09 +0100
From: Ivo Van Doorn <[email protected]>
To: Gertjan van Wingerde <[email protected]>
Cc: Jakub Kici?ski <[email protected]>, [email protected],
[email protected]
Subject: Re: [rt2x00-users] [PATCH 4/7] rt2800usb: Let rt2x00usb
handle USB padding
Message-ID:
<CAOZOX0XauBTyaBR9j75de=betz1v_rrfgdjc7bpydsa9hyi...@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-2
On Wed, Dec 28, 2011 at 1:53 AM, Gertjan van Wingerde
<[email protected]> wrote:
> From: Jakub Kici?ski <[email protected]>
>
> Older USB drivers does not append end padding to skb but instead report
> it in size of data to be transmitted to HW. rt2800usb should follow that
> behaviour. Custom write_tx_data callback which was adding pad to skb
> is not be needed any more.
>
> Thanks to this patch frames handed back from rt2800usb to mac80211 will
> no longer contain end padding.
What happened to the reports that after this (and the next) patch, the
non-2800 USB
drivers are failing?
>
> Signed-off-by: Jakub Kicinski <[email protected]>
> Signed-off-by: Gertjan van Wingerde <[email protected]>
> ---
> ?drivers/net/wireless/rt2x00/rt2800usb.c | ? 37 ++++++++----------------------
> ?1 files changed, 10 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c
> b/drivers/net/wireless/rt2x00/rt2800usb.c
> index 313cc7f..b15c215 100644
> --- a/drivers/net/wireless/rt2x00/rt2800usb.c
> +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
> @@ -400,10 +400,10 @@ static void rt2800usb_write_tx_desc(struct queue_entry
> *entry,
> ? ? ? ?/*
> ? ? ? ? * The size of TXINFO_W0_USB_DMA_TX_PKT_LEN is
> ? ? ? ? * TXWI + 802.11 header + L2 pad + payload + pad,
> - ? ? ? ?* so need to decrease size of TXINFO and USB end pad.
> + ? ? ? ?* so need to decrease size of TXINFO.
> ? ? ? ? */
> ? ? ? ?rt2x00_set_field32(&word, TXINFO_W0_USB_DMA_TX_PKT_LEN,
> - ? ? ? ? ? ? ? ? ? ? ? ? ?entry->skb->len - TXINFO_DESC_SIZE - 4);
> + ? ? ? ? ? ? ? ? ? ? ? ? ?roundup(entry->skb->len, 4) - TXINFO_DESC_SIZE);
> ? ? ? ?rt2x00_set_field32(&word, TXINFO_W0_WIV,
> ? ? ? ? ? ? ? ? ? ? ? ? ? !test_bit(ENTRY_TXD_ENCRYPT_IV, &txdesc->flags));
> ? ? ? ?rt2x00_set_field32(&word, TXINFO_W0_QSEL, 2);
> @@ -421,37 +421,20 @@ static void rt2800usb_write_tx_desc(struct queue_entry
> *entry,
> ? ? ? ?skbdesc->desc_len = TXINFO_DESC_SIZE + TXWI_DESC_SIZE;
> ?}
>
> -static void rt2800usb_write_tx_data(struct queue_entry *entry,
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? struct txentry_desc *txdesc)
> +/*
> + * TX data initialization
> + */
> +static int rt2800usb_get_tx_data_len(struct queue_entry *entry)
> ?{
> - ? ? ? unsigned int len;
> - ? ? ? int err;
> -
> - ? ? ? rt2800_write_tx_data(entry, txdesc);
> -
> ? ? ? ?/*
> - ? ? ? ?* pad(1~3 bytes) is added after each 802.11 payload.
> - ? ? ? ?* USB end pad(4 bytes) is added at each USB bulk out packet end.
> + ? ? ? ?* pad(1~3 bytes) is needed after each 802.11 payload.
> + ? ? ? ?* USB end pad(4 bytes) is needed at each USB bulk out packet end.
> ? ? ? ? * TX frame format is :
> ? ? ? ? * | TXINFO | TXWI | 802.11 header | L2 pad | payload | pad | USB end
> pad |
> ? ? ? ? * ? ? ? ? ? ? ? ? |<------------- tx_pkt_len ------------->|
> ? ? ? ? */
> - ? ? ? len = roundup(entry->skb->len, 4) + 4;
> - ? ? ? err = skb_padto(entry->skb, len);
> - ? ? ? if (unlikely(err)) {
> - ? ? ? ? ? ? ? WARNING(entry->queue->rt2x00dev, "TX SKB padding error, out
> of memory\n");
> - ? ? ? ? ? ? ? return;
> - ? ? ? }
>
> - ? ? ? entry->skb->len = len;
> -}
> -
> -/*
> - * TX data initialization
> - */
> -static int rt2800usb_get_tx_data_len(struct queue_entry *entry)
> -{
> - ? ? ? return entry->skb->len;
> + ? ? ? return roundup(entry->skb->len, 4) + 4;
> ?}
>
> ?/*
> @@ -807,7 +790,7 @@ static const struct rt2x00lib_ops rt2800usb_rt2x00_ops = {
> ? ? ? ?.flush_queue ? ? ? ? ? ?= rt2x00usb_flush_queue,
> ? ? ? ?.tx_dma_done ? ? ? ? ? ?= rt2800usb_tx_dma_done,
> ? ? ? ?.write_tx_desc ? ? ? ? ?= rt2800usb_write_tx_desc,
> - ? ? ? .write_tx_data ? ? ? ? ?= rt2800usb_write_tx_data,
> + ? ? ? .write_tx_data ? ? ? ? ?= rt2800_write_tx_data,
> ? ? ? ?.write_beacon ? ? ? ? ? = rt2800_write_beacon,
> ? ? ? ?.clear_beacon ? ? ? ? ? = rt2800_clear_beacon,
> ? ? ? ?.get_tx_data_len ? ? ? ?= rt2800usb_get_tx_data_len,
> --
> 1.7.7.4
>
------------------------------
_______________________________________________
users mailing list
[email protected]
http://rt2x00.serialmonkey.com/mailman/listinfo/users_rt2x00.serialmonkey.com
End of users Digest, Vol 34, Issue 16
*************************************
