* [PATCH] mac80211: kill antenna select ioctls
@ 2007-06-22 8:10 Johannes Berg
2007-06-22 9:32 ` Michael Buesch
0 siblings, 1 reply; 5+ messages in thread
From: Johannes Berg @ 2007-06-22 8:10 UTC (permalink / raw)
To: John W. Linville; +Cc: Jiri Benc, linux-wireless
Not used anywhere.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
net/mac80211/hostapd_ioctl.h | 2 --
net/mac80211/ieee80211_ioctl.c | 20 --------------------
2 files changed, 22 deletions(-)
--- wireless-dev.orig/net/mac80211/hostapd_ioctl.h 2007-06-22 10:08:24.558632620 +0200
+++ wireless-dev/net/mac80211/hostapd_ioctl.h 2007-06-22 10:08:56.158632620 +0200
@@ -31,8 +31,6 @@ enum {
PRISM2_PARAM_HOST_ENCRYPT = 17,
PRISM2_PARAM_HOST_DECRYPT = 18,
PRISM2_PARAM_IEEE_802_1X = 23,
- PRISM2_PARAM_ANTSEL_TX = 24,
- PRISM2_PARAM_ANTSEL_RX = 25,
/* Instant802 additions */
PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES = 1001,
--- wireless-dev.orig/net/mac80211/ieee80211_ioctl.c 2007-06-22 10:08:59.318632620 +0200
+++ wireless-dev/net/mac80211/ieee80211_ioctl.c 2007-06-22 10:09:10.418632620 +0200
@@ -2167,18 +2167,6 @@ static int ieee80211_ioctl_prism2_param(
sdata->ieee802_1x = value;
break;
- case PRISM2_PARAM_ANTSEL_TX:
- local->hw.conf.antenna_sel_tx = value;
- if (ieee80211_hw_config(local))
- ret = -EINVAL;
- break;
-
- case PRISM2_PARAM_ANTSEL_RX:
- local->hw.conf.antenna_sel_rx = value;
- if (ieee80211_hw_config(local))
- ret = -EINVAL;
- break;
-
case PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES:
local->cts_protect_erp_frames = value;
break;
@@ -2377,14 +2365,6 @@ static int ieee80211_ioctl_get_prism2_pa
*param = sdata->ieee802_1x;
break;
- case PRISM2_PARAM_ANTSEL_TX:
- *param = local->hw.conf.antenna_sel_tx;
- break;
-
- case PRISM2_PARAM_ANTSEL_RX:
- *param = local->hw.conf.antenna_sel_rx;
- break;
-
case PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES:
*param = local->cts_protect_erp_frames;
break;
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] mac80211: kill antenna select ioctls
2007-06-22 8:10 [PATCH] mac80211: kill antenna select ioctls Johannes Berg
@ 2007-06-22 9:32 ` Michael Buesch
2007-06-22 9:28 ` Ivo van Doorn
2007-06-22 10:01 ` Johannes Berg
0 siblings, 2 replies; 5+ messages in thread
From: Michael Buesch @ 2007-06-22 9:32 UTC (permalink / raw)
To: Johannes Berg; +Cc: John W. Linville, Jiri Benc, linux-wireless
On Friday 22 June 2007 10:10:20 Johannes Berg wrote:
> Not used anywhere.
It's used in bcm43xx.
Though, I'm not sure anybody in userspace actually calls this strange ioctl.
> Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
>
> ---
> net/mac80211/hostapd_ioctl.h | 2 --
> net/mac80211/ieee80211_ioctl.c | 20 --------------------
> 2 files changed, 22 deletions(-)
>
> --- wireless-dev.orig/net/mac80211/hostapd_ioctl.h 2007-06-22 10:08:24.558632620 +0200
> +++ wireless-dev/net/mac80211/hostapd_ioctl.h 2007-06-22 10:08:56.158632620 +0200
> @@ -31,8 +31,6 @@ enum {
> PRISM2_PARAM_HOST_ENCRYPT = 17,
> PRISM2_PARAM_HOST_DECRYPT = 18,
> PRISM2_PARAM_IEEE_802_1X = 23,
> - PRISM2_PARAM_ANTSEL_TX = 24,
> - PRISM2_PARAM_ANTSEL_RX = 25,
>
> /* Instant802 additions */
> PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES = 1001,
> --- wireless-dev.orig/net/mac80211/ieee80211_ioctl.c 2007-06-22 10:08:59.318632620 +0200
> +++ wireless-dev/net/mac80211/ieee80211_ioctl.c 2007-06-22 10:09:10.418632620 +0200
> @@ -2167,18 +2167,6 @@ static int ieee80211_ioctl_prism2_param(
> sdata->ieee802_1x = value;
> break;
>
> - case PRISM2_PARAM_ANTSEL_TX:
> - local->hw.conf.antenna_sel_tx = value;
> - if (ieee80211_hw_config(local))
> - ret = -EINVAL;
> - break;
> -
> - case PRISM2_PARAM_ANTSEL_RX:
> - local->hw.conf.antenna_sel_rx = value;
> - if (ieee80211_hw_config(local))
> - ret = -EINVAL;
> - break;
> -
> case PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES:
> local->cts_protect_erp_frames = value;
> break;
> @@ -2377,14 +2365,6 @@ static int ieee80211_ioctl_get_prism2_pa
> *param = sdata->ieee802_1x;
> break;
>
> - case PRISM2_PARAM_ANTSEL_TX:
> - *param = local->hw.conf.antenna_sel_tx;
> - break;
> -
> - case PRISM2_PARAM_ANTSEL_RX:
> - *param = local->hw.conf.antenna_sel_rx;
> - break;
> -
> case PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES:
> *param = local->cts_protect_erp_frames;
> break;
>
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
--
Greetings Michael.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] mac80211: kill antenna select ioctls
2007-06-22 9:32 ` Michael Buesch
@ 2007-06-22 9:28 ` Ivo van Doorn
2007-06-22 9:45 ` Michael Buesch
2007-06-22 10:01 ` Johannes Berg
1 sibling, 1 reply; 5+ messages in thread
From: Ivo van Doorn @ 2007-06-22 9:28 UTC (permalink / raw)
To: Michael Buesch; +Cc: Johannes Berg, John W. Linville, Jiri Benc, linux-wireless
On Friday 22 June 2007 11:32, Michael Buesch wrote:
> On Friday 22 June 2007 10:10:20 Johannes Berg wrote:
> > Not used anywhere.
>
> It's used in bcm43xx.
> Though, I'm not sure anybody in userspace actually calls this strange ioctl.
rt2x00 uses these antenna_sel_{t,r}x fields,
but they are also set within the rate selection.
So with the ioctls taken out, the fields itself
will still be changed.
In the legacy Ralink drivers, antenna selection was based
on the rssi value. Since rate_control conrtrols the rate based
on (among other things) the rssi it could take control of these
2 fields as well.
Ivo
> > Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
> >
> > ---
> > net/mac80211/hostapd_ioctl.h | 2 --
> > net/mac80211/ieee80211_ioctl.c | 20 --------------------
> > 2 files changed, 22 deletions(-)
> >
> > --- wireless-dev.orig/net/mac80211/hostapd_ioctl.h 2007-06-22 10:08:24.558632620 +0200
> > +++ wireless-dev/net/mac80211/hostapd_ioctl.h 2007-06-22 10:08:56.158632620 +0200
> > @@ -31,8 +31,6 @@ enum {
> > PRISM2_PARAM_HOST_ENCRYPT = 17,
> > PRISM2_PARAM_HOST_DECRYPT = 18,
> > PRISM2_PARAM_IEEE_802_1X = 23,
> > - PRISM2_PARAM_ANTSEL_TX = 24,
> > - PRISM2_PARAM_ANTSEL_RX = 25,
> >
> > /* Instant802 additions */
> > PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES = 1001,
> > --- wireless-dev.orig/net/mac80211/ieee80211_ioctl.c 2007-06-22 10:08:59.318632620 +0200
> > +++ wireless-dev/net/mac80211/ieee80211_ioctl.c 2007-06-22 10:09:10.418632620 +0200
> > @@ -2167,18 +2167,6 @@ static int ieee80211_ioctl_prism2_param(
> > sdata->ieee802_1x = value;
> > break;
> >
> > - case PRISM2_PARAM_ANTSEL_TX:
> > - local->hw.conf.antenna_sel_tx = value;
> > - if (ieee80211_hw_config(local))
> > - ret = -EINVAL;
> > - break;
> > -
> > - case PRISM2_PARAM_ANTSEL_RX:
> > - local->hw.conf.antenna_sel_rx = value;
> > - if (ieee80211_hw_config(local))
> > - ret = -EINVAL;
> > - break;
> > -
> > case PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES:
> > local->cts_protect_erp_frames = value;
> > break;
> > @@ -2377,14 +2365,6 @@ static int ieee80211_ioctl_get_prism2_pa
> > *param = sdata->ieee802_1x;
> > break;
> >
> > - case PRISM2_PARAM_ANTSEL_TX:
> > - *param = local->hw.conf.antenna_sel_tx;
> > - break;
> > -
> > - case PRISM2_PARAM_ANTSEL_RX:
> > - *param = local->hw.conf.antenna_sel_rx;
> > - break;
> > -
> > case PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES:
> > *param = local->cts_protect_erp_frames;
> > break;
> >
> >
> > -
> > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> >
> >
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] mac80211: kill antenna select ioctls
2007-06-22 9:28 ` Ivo van Doorn
@ 2007-06-22 9:45 ` Michael Buesch
0 siblings, 0 replies; 5+ messages in thread
From: Michael Buesch @ 2007-06-22 9:45 UTC (permalink / raw)
To: Ivo van Doorn; +Cc: Johannes Berg, John W. Linville, Jiri Benc, linux-wireless
On Friday 22 June 2007 11:28:49 Ivo van Doorn wrote:
> On Friday 22 June 2007 11:32, Michael Buesch wrote:
> > On Friday 22 June 2007 10:10:20 Johannes Berg wrote:
> > > Not used anywhere.
> >
> > It's used in bcm43xx.
> > Though, I'm not sure anybody in userspace actually calls this strange ioctl.
>
> rt2x00 uses these antenna_sel_{t,r}x fields,
> but they are also set within the rate selection.
> So with the ioctls taken out, the fields itself
> will still be changed.
Oh, ok. Then I remembered it incorrectly. I thought
the values were dead and always 0 now. So I'm OK with this patch,
as long as no userspace program calls it.
--
Greetings Michael.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] mac80211: kill antenna select ioctls
2007-06-22 9:32 ` Michael Buesch
2007-06-22 9:28 ` Ivo van Doorn
@ 2007-06-22 10:01 ` Johannes Berg
1 sibling, 0 replies; 5+ messages in thread
From: Johannes Berg @ 2007-06-22 10:01 UTC (permalink / raw)
To: Michael Buesch; +Cc: John W. Linville, Jiri Benc, linux-wireless
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
On Fri, 2007-06-22 at 11:32 +0200, Michael Buesch wrote:
> On Friday 22 June 2007 10:10:20 Johannes Berg wrote:
> > Not used anywhere.
>
> It's used in bcm43xx.
> Though, I'm not sure anybody in userspace actually calls this strange ioctl.
That's what I meant, it's not used in userspace.
johannes
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 190 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2007-06-22 9:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-22 8:10 [PATCH] mac80211: kill antenna select ioctls Johannes Berg
2007-06-22 9:32 ` Michael Buesch
2007-06-22 9:28 ` Ivo van Doorn
2007-06-22 9:45 ` Michael Buesch
2007-06-22 10:01 ` Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox