mac80211: Implement commit in wireless extensions
PATCH v2 1/1 mac80211: Implement commit in wireless extensions
This implements commit in wireless extensions for completeness and mayb= e it could be useful for debugging to initiate a new rejoining process = without changing the config.
I not so familiar with nl80211 at the moment, so I want add it to nl802= 11 in a second patch.
---
Version 2: Fix bad header.
Hope we can find a compromise in the conception.
net/mac80211/ieee80211_i.h +0 -0
@@ -920,6 +920,7 @@ static inline int ieee80211_bssid_match(const u8 *r=
addr, const u8 *addr)
=20
int ieee80211_hw_config(struct ieee80211_local *local, u32 changed); int ieee80211_if_config(struct ieee80211_sub_if_data *sdata, u32 chang=
ed);
+void ieee80211_commit(struct ieee80211_sub_if_data *sdata);
void ieee80211_tx_set_protected(struct ieee80211_tx_data *tx); void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sd=
ata,
u32 changed);
net/mac80211/main.c +0 -0
@@ -294,6 +294,20 @@ int ieee80211_hw_config(struct ieee80211_local *lo=
cal, u32 changed)
return ret;
}
=20
+void ieee80211_commit(struct ieee80211_sub_if_data *sdata) +{
+ switch (sdata->vif.type) {
+ case NL80211_IFTYPE_ADHOC:
+ ieee80211_ibss_commit(sdata);
+ break;
+ case NL80211_IFTYPE_STATION:
+ ieee80211_sta_commit(sdata);
+ break;
+ default:
+ break;
+ }
+}
+
void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sd=
ata,
u32 changed)
{
net/mac80211/wext.c +0 -0
@@ -121,6 +121,15 @@ static int ieee80211_set_encryption(struct ieee802=
11_sub_if_data *sdata, u8 *sta
return err;
}
=20
+static int ieee80211_ioctl_commit(struct net_device *dev,
+ struct iw_request_info *info,
+ struct iw_point *data, char *extra)
+{
+ struct ieee80211_sub_if_data *sdata =3D IEEE80211_DEV_TO_SUB_IF(dev);
+ ieee80211_commit(sdata);
+ return 0;
+}
+
static int ieee80211_ioctl_siwgenie(struct net_device *dev,
struct iw_request_info *info, struct iw_point *data, char *extra)
@@ -1035,7 +1044,7 @@ static int ieee80211_ioctl_siwencodeext(struct ne= t_device *dev,
=20
static const iw_handler ieee80211_handler[] =3D
{
- (iw_handler) NULL, /* SIOCSIWCOMMIT */
+ (iw_handler) ieee80211_ioctl_commit, /* SIOCSIWCOMMIT */
(iw_handler) cfg80211_wext_giwname, /* SIOCGIWNAME */
(iw_handler) NULL, /* SIOCSIWNWID */
(iw_handler) NULL, /* SIOCGIWNWID */
--=20
Psssst! Schon vom neuen GMX MultiMessenger geh=F6rt? Der kann`s mit all=
en: http://www.gmx.net/de/go/multimessenger01
--
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
Quoted 9 lines · On Friday 27 February 2009 00:21:49 Alina Friedrichsen wrote:
This implements commit in wireless extensions for completeness and maybe it could be useful for debugging to initiate a new rejoining process without changing the config.
I not so familiar with nl80211 at the moment, so I want add it to nl80211 in a second patch.
Signed-off-by Alina Friedrichsen <[email protected]>---
Version 2: Fix bad header.Hope we can find a compromise in the conception.
The WEXT commit function is one of the worst WEXT functions.
And this patch even abuses it even more. Commit is meant to commit _pending_ changes. It is _not_ meant to re-apply existing changes.
But as we never have pending changes in mac80211, the commit function doesn't make any sense for mac80211.
I vote for dropping this patch entirely, as it just adds an abusive implementation of a crap API.
If you want to re-apply some settings, please do this from userspace entirely. You don't need kernel support for this.
Quoted 67 lines
net/mac80211/ieee80211_i.h +1
-0@@ -920,6 +920,7 @@ static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr)int ieee80211_hw_config (struct ieee80211_local *local,u32 changed);int ieee80211_if_config (struct ieee80211_sub_if_data *sdata,u32 changed); +void ieee80211_commit (struct ieee80211_sub_if_data *sdata);void ieee80211_tx_set_protected (struct ieee80211_tx_data *tx);void ieee80211_bss_info_change_notify (struct ieee80211_sub_if_data *sdata,u32 changed);net/mac80211/main.c +14
-0@@ -294,6 +294,20 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)return ret; } +void ieee80211_commit (struct ieee80211_sub_if_data *sdata) +{ +switch (sdata->vif.type) { +case NL80211_IFTYPE_ADHOC : +ieee80211_ibss_commit (sdata); +break ; +case NL80211_IFTYPE_STATION : +ieee80211_sta_commit (sdata); +break ; +default : +break ; + } +} +void ieee80211_bss_info_change_notify (struct ieee80211_sub_if_data *sdata,u32 changed) {net/mac80211/wext.c +10
-1@@ -121,6 +121,15 @@ static int ieee80211_set_encryption(struct ieee80211_sub_if_data *sdata, u8 *stareturn err; } +static int ieee80211_ioctl_commit (struct net_device *dev, +struct iw_request_info *info, +struct iw_point *data,char *extra) +{ +struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); +ieee80211_commit (sdata); +return 0 ; +} +static int ieee80211_ioctl_siwgenie (struct net_device *dev,struct iw_request_info *info,struct iw_point *data,char *extra)@@ -1035,7 +1044,7 @@ static int ieee80211_ioctl_siwencodeext(struct net_device *dev,static const iw_handler ieee80211_handler[] = { - (iw_handler )NULL ,/* SIOCSIWCOMMIT */ + (iw_handler ) ieee80211_ioctl_commit,/* SIOCSIWCOMMIT */ (iw_handler ) cfg80211_wext_giwname,/* SIOCGIWNAME */ (iw_handler )NULL ,/* SIOCSIWNWID */ (iw_handler )NULL ,/* SIOCGIWNWID */
Signature · 1 line
Greetings, Michael.
Johannes Berg
maintainerQuoted 4 lines · Alina Friedrichsen
This implements commit in wireless extensions for completeness and maybe it could be useful for debugging to initiate a new rejoining process without changing the config.
Quoted 8 lines
I not so familiar with nl80211 at the moment, so I want add it to nl80211 in a second patch.
Signed-off-by Alina Friedrichsen <[email protected]>---
Version 2: Fix bad header.Hope we can find a compromise in the conception.
I stand by my opinion that I don't want to have this in the code since there's no real reason to have it.
johannes