From f0e71a72df64c8e16ed696d5cac9ab4bf247157f Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Tue, 12 Feb 2008 14:02:06 +0100 Subject: [PATCH] --- yaml --- r: 89923 b: refs/heads/master c: 5200e8cdf26e32d15f7a125fd75310150f9b2812 h: refs/heads/master i: 89921: 01998c87c8f82a187a5972fed5c0967aee6fe2bd 89919: 7d045ae52df788954edc7e510ba82da0c2973a8a v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/p54common.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 85ffec2a5e47..9e34ec5e7cfa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c1a1b124f793aaf9f6bcb8f6b5d05c29c2db690 +refs/heads/master: 5200e8cdf26e32d15f7a125fd75310150f9b2812 diff --git a/trunk/drivers/net/wireless/p54common.c b/trunk/drivers/net/wireless/p54common.c index 0e9f887178ce..424de9f4d5e7 100644 --- a/trunk/drivers/net/wireless/p54common.c +++ b/trunk/drivers/net/wireless/p54common.c @@ -782,15 +782,9 @@ static void p54_init_vdcf(struct ieee80211_hw *dev) vdcf = (struct p54_tx_control_vdcf *) hdr->data; - /* - * FIXME: The default values in the spec (IEEE 802.11 - * 7.3.2.19 Table 37) are 47, 94, 0, 0, why use - * 47, 94, 63, 0 here? Also, the default AIFS - * values (second parameter) are 2, 2, 3, 7... - */ P54_SET_QUEUE(vdcf->queue[0], 0x0002, 0x0003, 0x0007, 47); P54_SET_QUEUE(vdcf->queue[1], 0x0002, 0x0007, 0x000f, 94); - P54_SET_QUEUE(vdcf->queue[2], 0x0002, 0x000f, 0x03ff, 63); + P54_SET_QUEUE(vdcf->queue[2], 0x0003, 0x000f, 0x03ff, 0); P54_SET_QUEUE(vdcf->queue[3], 0x0007, 0x000f, 0x03ff, 0); }