mac80211: add power management support

This patch adds power management support in mac80211.

This allows us to enable power management through the "iwconfig <device=

The code is based on "mac80211-10.0.0" but it is a little bit modified.

ctl.c
index 6caa3ec..f5eebec 100644

@@ -674,6 +687,51 @@ static int ieee80211_ioctl_giwtxpower(struct net_d=

evice *dev,
return 0;
}
=20
+static int ieee80211_ioctl_siwpower(struct net_device *dev,

+				    struct iw_request_info *info,
+				    union iwreq_data *wrqu,
+				    char *extra)

+{
+ struct ieee80211_local *local =3D wdev_priv(dev->ieee80211_ptr);
+ struct ieee80211_conf *conf =3D &local->hw.conf;
+
+ if (wrqu->power.disabled) {
+ conf->power_management_enable =3D 0;
+ if (ieee80211_hw_config(local))
+ return -EINVAL;
+ return 0;
+ }
+
+ switch (wrqu->power.flags & IW_POWER_MODE) {

+	case IW_POWER_ON:       /* If not specified */
+	case IW_POWER_MODE:     /* If set all mask */
+	case IW_POWER_ALL_R:    /* If explicitely state all */

+ break;
+ default: /* Otherwise we don't support it */
+ return -EINVAL;
+ }
+
+ conf->power_management_enable =3D 1;
+
+ if (ieee80211_hw_config(local))
+ return -EINVAL;
+
+ return 0;
+}
+
+static int ieee80211_ioctl_giwpower(struct net_device *dev,

+				    struct iw_request_info *info,
+				    union iwreq_data *wrqu,
+				    char *extra)

+{
+ struct ieee80211_local *local =3D wdev_priv(dev->ieee80211_ptr);
+ struct ieee80211_conf *conf =3D &local->hw.conf;
+
+ wrqu->power.disabled =3D !conf->power_management_enable;
+
+ return 0;
+}
+
static int ieee80211_ioctl_siwrts(struct net_device *dev,
struct iw_request_info *info, struct iw_param *rts, char *extra)
@@ -1111,8 +1166,8 @@ static const iw_handler ieee80211_handler[] =3D
(iw_handler) ieee80211_ioctl_giwretry, /* SIOCGIWRETRY */
(iw_handler) ieee80211_ioctl_siwencode, /* SIOCSIWENCODE */
(iw_handler) ieee80211_ioctl_giwencode, /* SIOCGIWENCODE */
- (iw_handler) NULL, /* SIOCSIWPOWER */
- (iw_handler) NULL, /* SIOCGIWPOWER */
+ (iw_handler) ieee80211_ioctl_siwpower, /* SIOCSIWPOWER */
+ (iw_handler) ieee80211_ioctl_giwpower, /* SIOCGIWPOWER */
(iw_handler) NULL, /* -- hole -- */
(iw_handler) NULL, /* -- hole -- */
(iw_handler) ieee80211_ioctl_siwgenie, /* SIOCSIWGENIE */

--=20
Miguel Bot=C3=B3n
-
To unsubscribe from this list: send the line "unsubscribe linux-wireles= s" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Ok, the previous patch had a little error.

--

This patch adds power management support in mac80211.

This allows us to enable power management through the "iwconfig <device=

<off/on>" command.
The code is based on "mac80211-10.0.0" but it is a little bit modified.

index 5fcc4c1..c82b6fa 100644
@@ -452,6 +452,8 @@ struct ieee80211_conf {
 	u8 antenna_max;
 	u8 antenna_sel_tx;
 	u8 antenna_sel_rx;
+
+	u8 power_management_enable;     /* flag to enable/disable power manag=

ement=20
*/
};
=20
/**

ctl.c
index 6caa3ec..f5eebec 100644

@@ -674,6 +687,51 @@ static int ieee80211_ioctl_giwtxpower(struct net_d=

evice=20
*dev,
return 0;
}
=20
+static int ieee80211_ioctl_siwpower(struct net_device *dev,

+				    struct iw_request_info *info,
+				    union iwreq_data *wrqu,
+				    char *extra)

+{
+ struct ieee80211_local *local =3D wdev_priv(dev->ieee80211_ptr);
+ struct ieee80211_conf *conf =3D &local->hw.conf;
+
+ if (wrqu->power.disabled) {
+ conf->power_management_enable =3D 0;
+ if (ieee80211_hw_config(local))
+ return -EINVAL;
+ return 0;
+ }
+
+ switch (wrqu->power.flags & IW_POWER_MODE) {

+	case IW_POWER_ON:       /* If not specified */
+	case IW_POWER_MODE:     /* If set all mask */
+	case IW_POWER_ALL_R:    /* If explicitely state all */

+ break;
+ default: /* Otherwise we don't support it */
+ return -EINVAL;
+ }
+
+ conf->power_management_enable =3D 1;
+
+ if (ieee80211_hw_config(local))
+ return -EINVAL;
+
+ return 0;
+}
+
+static int ieee80211_ioctl_giwpower(struct net_device *dev,

+				    struct iw_request_info *info,
+				    union iwreq_data *wrqu,
+				    char *extra)

+{
+ struct ieee80211_local *local =3D wdev_priv(dev->ieee80211_ptr);
+ struct ieee80211_conf *conf =3D &local->hw.conf;
+
+ wrqu->power.disabled =3D !conf->power_management_enable;
+
+ return 0;
+}
+
static int ieee80211_ioctl_siwrts(struct net_device *dev,
struct iw_request_info *info, struct iw_param *rts, char *extra)
@@ -1111,8 +1166,8 @@ static const iw_handler ieee80211_handler[] =3D
(iw_handler) ieee80211_ioctl_giwretry, /* SIOCGIWRETRY */
(iw_handler) ieee80211_ioctl_siwencode, /* SIOCSIWENCODE */
(iw_handler) ieee80211_ioctl_giwencode, /* SIOCGIWENCODE */
- (iw_handler) NULL, /* SIOCSIWPOWER */
- (iw_handler) NULL, /* SIOCGIWPOWER */
+ (iw_handler) ieee80211_ioctl_siwpower, /* SIOCSIWPOWER */
+ (iw_handler) ieee80211_ioctl_giwpower, /* SIOCGIWPOWER */
(iw_handler) NULL, /* -- hole -- */
(iw_handler) NULL, /* -- hole -- */
(iw_handler) ieee80211_ioctl_siwgenie, /* SIOCSIWGENIE */

--=20
Miguel Bot=C3=B3n
-
To unsubscribe from this list: send the line "unsubscribe linux-wireles= s" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Today is not a good day for me... I sent the previous patch with wordwr= ap enabled.
This one is the correct.

--

This patch adds power management support in mac80211.

This allows us to enable power management through the "iwconfig <device=

The code is based on "mac80211-10.0.0" but it is a little bit modified.

index 5fcc4c1..c82b6fa 100644
@@ -452,6 +452,8 @@ struct ieee80211_conf {
 	u8 antenna_max;
 	u8 antenna_sel_tx;
 	u8 antenna_sel_rx;
+
+	u8 power_management_enable;     /* flag to enable/disable power manag=

ement */
};
=20
/**

ctl.c
index 6caa3ec..f5eebec 100644

@@ -674,6 +687,51 @@ static int ieee80211_ioctl_giwtxpower(struct net_d=

evice *dev,
return 0;
}
=20
+static int ieee80211_ioctl_siwpower(struct net_device *dev,

+				    struct iw_request_info *info,
+				    union iwreq_data *wrqu,
+				    char *extra)

+{
+ struct ieee80211_local *local =3D wdev_priv(dev->ieee80211_ptr);
+ struct ieee80211_conf *conf =3D &local->hw.conf;
+
+ if (wrqu->power.disabled) {
+ conf->power_management_enable =3D 0;
+ if (ieee80211_hw_config(local))
+ return -EINVAL;
+ return 0;
+ }
+
+ switch (wrqu->power.flags & IW_POWER_MODE) {

+	case IW_POWER_ON:       /* If not specified */
+	case IW_POWER_MODE:     /* If set all mask */
+	case IW_POWER_ALL_R:    /* If explicitely state all */

+ break;
+ default: /* Otherwise we don't support it */
+ return -EINVAL;
+ }
+
+ conf->power_management_enable =3D 1;
+
+ if (ieee80211_hw_config(local))
+ return -EINVAL;
+
+ return 0;
+}
+
+static int ieee80211_ioctl_giwpower(struct net_device *dev,

+				    struct iw_request_info *info,
+				    union iwreq_data *wrqu,
+				    char *extra)

+{
+ struct ieee80211_local *local =3D wdev_priv(dev->ieee80211_ptr);
+ struct ieee80211_conf *conf =3D &local->hw.conf;
+
+ wrqu->power.disabled =3D !conf->power_management_enable;
+
+ return 0;
+}
+
static int ieee80211_ioctl_siwrts(struct net_device *dev,
struct iw_request_info *info, struct iw_param *rts, char *extra)
@@ -1111,8 +1166,8 @@ static const iw_handler ieee80211_handler[] =3D
(iw_handler) ieee80211_ioctl_giwretry, /* SIOCGIWRETRY */
(iw_handler) ieee80211_ioctl_siwencode, /* SIOCSIWENCODE */
(iw_handler) ieee80211_ioctl_giwencode, /* SIOCGIWENCODE */
- (iw_handler) NULL, /* SIOCSIWPOWER */
- (iw_handler) NULL, /* SIOCGIWPOWER */
+ (iw_handler) ieee80211_ioctl_siwpower, /* SIOCSIWPOWER */
+ (iw_handler) ieee80211_ioctl_giwpower, /* SIOCGIWPOWER */
(iw_handler) NULL, /* -- hole -- */
(iw_handler) NULL, /* -- hole -- */
(iw_handler) ieee80211_ioctl_siwgenie, /* SIOCSIWGENIE */

--=20
Miguel Bot=C3=B3n
-
To unsubscribe from this list: send the line "unsubscribe linux-wireles= s" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Hi John,

Sorry for being late to the game, but would a similar patch against you= r
-next-2.6 tree be considered for inclusion ?

Cheers,
Samuel.

ce> power=20

d.

ess" in

--
To unsubscribe from this list: send the line "unsubscribe linux-wireles= s" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

our

It seems like a reasonable start to me. Anyone else have comments?

John
--=20
John W. Linville
[email protected]
--
To unsubscribe from this list: send the line "unsubscribe linux-wireles= s" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

I had one about it returning -EINVAL for all errors that was never addressed afaict.

johannes

t your

Didn't Yi submitted this one like year ago and rejected?

This is why we have currently implemented in iwlwif sysfs.

/sys/class/net/wlanX/devices/power_level
there are defined 6 power levels
0 - CAM mode (Continuous Aware Mode)
6 - AUTO
1 to 5 levels that specifies power save aggressiveness empirically dev= eloped.
AUTO - depends on system power source/level
system power level is AC or BATTERY - currently we do not have anything that tells us whether we run on battery or ac. Other factor is association state.

This can be expressed as
iwconfig power saving 1..5
iwconfig power off - > CAM mode
iwconfig power auto - this is unfortunately not defined by iwconfig

If this acceptable we can submit the patch

Thanks
Tomas
--
To unsubscribe from this list: send the line "unsubscribe linux-wireles= s" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Hi Thomas=0D
=0D
On Fri, 27 Jun 2008 00:51:57 +0300, "Tomas Winkler" <[email protected]>=0D wrote:=0D

:=0D

st=0D

=0D

I searched through the mailing list, but couldnt find anything else=0D than this patch.=0D
=0D
=0D

Are you talking about the wext patch, or the sysfs one ?=0D I'd definitely be happy to have a look at the wext one.=0D =0D
Cheers,=0D
Samuel.

--
To unsubscribe from this list: send the line "unsubscribe linux-wireles= s" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Sounds good to me, at least. It would be nice to have PSM support to mac80211.

Kalle Valo

Hi John,

Here is my version then, against your wireless-next tree:

This patch implements the power management routines wireless extensions for mac80211.
For now we only support switching PS mode between on and off.

---
 include/net/mac80211.h |    2 ++
 net/mac80211/wext.c    |   43 +++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 43 insertions(+), 2 deletions(-)

Index: wireless-next-2.6/net/mac80211/wext.c
===================================================================
@@ -1000,6 +1000,45 @@ static int ieee80211_ioctl_giwencode(str
 	return 0;
 }
 
+static int ieee80211_ioctl_siwpower(struct net_device *dev,
+				    struct iw_request_info *info,
+				    struct iw_param *wrq,
+				    char *extra)
+{
+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+	struct ieee80211_conf *conf = &local->hw.conf;
+
+	if (wrq->disabled) {
+		conf->flags &= ~IEEE80211_CONF_PS;
+		return ieee80211_hw_config(local);
+	}
+
+	switch (wrq->flags & IW_POWER_MODE) {
+	case IW_POWER_ON:       /* If not specified */
+	case IW_POWER_MODE:     /* If set all mask */
+	case IW_POWER_ALL_R:    /* If explicitely state all */
+		conf->flags |= IEEE80211_CONF_PS;
+		break;
+	default:                /* Otherwise we don't support it */
+		return -EINVAL;
+	}
+
+	return ieee80211_hw_config(local);
+}
+
+static int ieee80211_ioctl_giwpower(struct net_device *dev,
+				    struct iw_request_info *info,
+				    union iwreq_data *wrqu,
+				    char *extra)
+{
+	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+	struct ieee80211_conf *conf = &local->hw.conf;
+
+	wrqu->power.disabled = !(conf->flags & IEEE80211_CONF_PS);
+
+	return 0;
+}
+
 static int ieee80211_ioctl_siwauth(struct net_device *dev,
 				   struct iw_request_info *info,
 				   struct iw_param *data, char *extra)

@@ -1202,8 +1241,8 @@ static const iw_handler ieee80211_handle
 	(iw_handler) ieee80211_ioctl_giwretry,		/* SIOCGIWRETRY */
 	(iw_handler) ieee80211_ioctl_siwencode,		/* SIOCSIWENCODE */
 	(iw_handler) ieee80211_ioctl_giwencode,		/* SIOCGIWENCODE */
-	(iw_handler) NULL,				/* SIOCSIWPOWER */
-	(iw_handler) NULL,				/* SIOCGIWPOWER */
+	(iw_handler) ieee80211_ioctl_siwpower,		/* SIOCSIWPOWER */
+	(iw_handler) ieee80211_ioctl_giwpower,		/* SIOCGIWPOWER */
 	(iw_handler) NULL,				/* -- hole -- */
 	(iw_handler) NULL,				/* -- hole -- */
 	(iw_handler) ieee80211_ioctl_siwgenie,		/* SIOCSIWGENIE */

Index: wireless-next-2.6/include/net/mac80211.h
===================================================================
@@ -396,11 +396,13 @@ struct ieee80211_rx_status {
  * @IEEE80211_CONF_SHORT_SLOT_TIME: use 802.11g short slot time
  * @IEEE80211_CONF_RADIOTAP: add radiotap header at receive time (if supported)
  * @IEEE80211_CONF_SUPPORT_HT_MODE: use 802.11n HT capabilities (if supported)
+ * @IEEE80211_CONF_PS: Enable 802.11 power save mode
  */
 enum ieee80211_conf_flags {
 	IEEE80211_CONF_SHORT_SLOT_TIME	= (1<<0),
 	IEEE80211_CONF_RADIOTAP		= (1<<1),
 	IEEE80211_CONF_SUPPORT_HT_MODE	= (1<<2),
+	IEEE80211_CONF_PS		= (1<<3),
 };
 
 /**