From: "John W. Linville" <linville@tuxdriver•com>
To: davem@davemloft•net
Cc: netdev@vger•kernel.org, linux-wireless@vger•kernel.org
Subject: Please pull 'upstream-davem' branch of wireless-2.6
Date: Tue, 6 Nov 2007 22:08:53 -0500 [thread overview]
Message-ID: <20071107030853.GB30169@tuxdriver.com> (raw)
Dave,
Here are a few for when you decide to open net-2.6.25... :-)
Thanks,
John
---
Individual patches are available here:
http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/upstream-davem
---
The following changes since commit 2655e2cee2d77459fcb7e10228259e4ee0328697:
Alan Cox (1):
ata_piix: Add additional PCI identifier for 40 wire short cable
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-davem
Mattias Nissler (1):
mac80211: Accept auto txpower setting
Michael Wu (1):
ieee80211: Add IEEE80211_MAX_FRAME_LEN to linux/ieee80211.h
include/linux/ieee80211.h | 14 +++++++-------
net/mac80211/ieee80211_ioctl.c | 21 +++++++++++++++++----
2 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 30621c2..214821a 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -81,18 +81,18 @@
/* miscellaneous IEEE 802.11 constants */
-#define IEEE80211_MAX_FRAG_THRESHOLD 2346
-#define IEEE80211_MAX_RTS_THRESHOLD 2347
+#define IEEE80211_MAX_FRAG_THRESHOLD 2352
+#define IEEE80211_MAX_RTS_THRESHOLD 2353
#define IEEE80211_MAX_AID 2007
#define IEEE80211_MAX_TIM_LEN 251
-#define IEEE80211_MAX_DATA_LEN 2304
/* Maximum size for the MA-UNITDATA primitive, 802.11 standard section
6.2.1.1.2.
- The figure in section 7.1.2 suggests a body size of up to 2312
- bytes is allowed, which is a bit confusing, I suspect this
- represents the 2304 bytes of real data, plus a possible 8 bytes of
- WEP IV and ICV. (this interpretation suggested by Ramiro Barreiro) */
+ 802.11e clarifies the figure in section 7.1.2. The frame body is
+ up to 2304 octets long (maximum MSDU size) plus any crypt overhead. */
+#define IEEE80211_MAX_DATA_LEN 2304
+/* 30 byte 4 addr hdr, 2 byte QoS, 2304 byte MSDU, 12 byte crypt, 4 byte FCS */
+#define IEEE80211_MAX_FRAME_LEN 2352
#define IEEE80211_MAX_SSID_LEN 32
diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c
index 6caa3ec..6d67217 100644
--- a/net/mac80211/ieee80211_ioctl.c
+++ b/net/mac80211/ieee80211_ioctl.c
@@ -634,22 +634,35 @@ static int ieee80211_ioctl_siwtxpower(struct net_device *dev,
{
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
bool need_reconfig = 0;
+ u8 new_power_level;
if ((data->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM)
return -EINVAL;
if (data->txpower.flags & IW_TXPOW_RANGE)
return -EINVAL;
- if (!data->txpower.fixed)
- return -EINVAL;
- if (local->hw.conf.power_level != data->txpower.value) {
- local->hw.conf.power_level = data->txpower.value;
+ if (data->txpower.fixed) {
+ new_power_level = data->txpower.value;
+ } else {
+ /* Automatic power level. Get the px power from the current
+ * channel. */
+ struct ieee80211_channel* chan = local->oper_channel;
+ if (!chan)
+ return -EINVAL;
+
+ new_power_level = chan->power_level;
+ }
+
+ if (local->hw.conf.power_level != new_power_level) {
+ local->hw.conf.power_level = new_power_level;
need_reconfig = 1;
}
+
if (local->hw.conf.radio_enabled != !(data->txpower.disabled)) {
local->hw.conf.radio_enabled = !(data->txpower.disabled);
need_reconfig = 1;
}
+
if (need_reconfig) {
ieee80211_hw_config(local);
/* The return value of hw_config is not of big interest here,
--
John W. Linville
linville@tuxdriver•com
next reply other threads:[~2007-11-07 3:09 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-07 3:08 John W. Linville [this message]
2007-11-20 5:24 ` Please pull 'upstream-davem' branch of wireless-2.6 David Miller
-- strict thread matches above, loose matches on Subject: below --
2008-01-08 19:29 John W. Linville
[not found] ` <20080108192914.GA3086-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2008-01-09 7:36 ` David Miller
2007-12-20 15:53 John W. Linville
2007-12-20 22:38 ` John W. Linville
[not found] ` <20071220223850.GL3139-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-12-21 4:04 ` David Miller
2007-12-17 20:55 John W. Linville
[not found] ` <20071217205540.GH3121-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-12-18 6:57 ` David Miller
2007-12-01 2:23 John W. Linville
[not found] ` <20071201022306.GA28032-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-12-01 13:54 ` Herbert Xu
2007-11-20 22:11 John W. Linville
[not found] ` <20071120221135.GI16090-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-11-21 1:27 ` David Miller
2007-10-10 0:21 John W. Linville
[not found] ` <20071010002145.GD3175-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-10-10 1:13 ` David Miller
2007-10-03 1:25 John W. Linville
[not found] ` <20071003012552.GE29361-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-10-03 1:45 ` John W. Linville
2007-10-03 2:01 ` David Miller
[not found] ` <20071002.190156.41633562.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2007-10-03 14:10 ` John W. Linville
[not found] ` <20071003141051.GA5790-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-10-03 21:52 ` David Miller
2007-09-15 13:20 John W. Linville
2007-08-15 0:32 Please pull 'fixes-davem' " John W. Linville
[not found] ` <20070815003234.GI7198-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-08-15 0:34 ` Please pull 'upstream-davem' " John W. Linville
[not found] ` <20070815003410.GJ7198-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-08-15 23:09 ` David Miller
2007-08-19 23:32 ` David Miller
2007-08-06 20:13 Please pull 'fixes-davem' " John W. Linville
2007-08-06 21:01 ` Please pull 'upstream-davem' " John W. Linville
2007-08-09 9:00 ` David Miller
2007-07-18 2:16 John W. Linville
2007-07-18 3:17 ` David Miller
[not found] ` <20070717.201716.112622844.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2007-07-18 15:34 ` John W. Linville
[not found] ` <20070718153449.GA6625-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-07-18 22:32 ` David Miller
2007-07-19 0:45 ` John W. Linville
2007-07-19 1:21 ` David Miller
2007-07-12 20:41 John W. Linville
[not found] ` <20070712204137.GB14486-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2007-07-15 1:59 ` David Miller
[not found] ` <20070714.185935.18577806.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2007-07-15 3:41 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071107030853.GB30169@tuxdriver.com \
--to=linville@tuxdriver$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox