[PATCH] mwifiex: remove set_channel cfg80211 hook

[PATCH] mwifiex: remove set_channel cfg80211 hook

[Johannes Berg]

From: Johannes Berg <johannes.berg@intel.com>

Since mwifiex only supports managed and IBSS
modes, it doesn't need a set_channel call. The
callback might be called, but it won't matter
as nothing can use the channel.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 drivers/net/wireless/mwifiex/cfg80211.c |   27 ---------------------------
 1 file changed, 27 deletions(-)

--- a/drivers/net/wireless/mwifiex/cfg80211.c	2012-05-11 18:02:41.000000000 +0200
+++ b/drivers/net/wireless/mwifiex/cfg80211.c	2012-05-11 18:36:38.000000000 +0200
@@ -365,32 +365,6 @@ mwifiex_set_rf_channel(struct mwifiex_pr
 }
 
 /*
- * CFG802.11 operation handler to set channel.
- *
- * This function can only be used when station is not connected.
- */
-static int
-mwifiex_cfg80211_set_channel(struct wiphy *wiphy, struct net_device *dev,
-			     struct ieee80211_channel *chan,
-			     enum nl80211_channel_type channel_type)
-{
-	struct mwifiex_private *priv;
-
-	if (dev)
-		priv = mwifiex_netdev_get_priv(dev);
-	else
-		priv = mwifiex_cfg80211_get_priv(wiphy);
-
-	if (priv->media_connected) {
-		wiphy_err(wiphy, "This setting is valid only when station "
-				"is not connected\n");
-		return -EINVAL;
-	}
-
-	return mwifiex_set_rf_channel(priv, chan, channel_type);
-}
-
-/*
  * This function sets the fragmentation threshold.
  *
  * The fragmentation threshold value must lie between MWIFIEX_FRAG_MIN_VALUE
@@ -1417,7 +1391,6 @@ static struct cfg80211_ops mwifiex_cfg80
 	.get_station = mwifiex_cfg80211_get_station,
 	.dump_station = mwifiex_cfg80211_dump_station,
 	.set_wiphy_params = mwifiex_cfg80211_set_wiphy_params,
-	.set_channel = mwifiex_cfg80211_set_channel,
 	.join_ibss = mwifiex_cfg80211_join_ibss,
 	.leave_ibss = mwifiex_cfg80211_leave_ibss,
 	.add_key = mwifiex_cfg80211_add_key,

RE: [PATCH] mwifiex: remove set_channel cfg80211 hook

[Bing Zhao]

SGkgSm9oYW5uZXMsDQoNCj4gRnJvbTogSm9oYW5uZXMgQmVyZyA8am9oYW5uZXMuYmVyZ0BpbnRl
bC5jb20+DQo+IA0KPiBTaW5jZSBtd2lmaWV4IG9ubHkgc3VwcG9ydHMgbWFuYWdlZCBhbmQgSUJT
Uw0KPiBtb2RlcywgaXQgZG9lc24ndCBuZWVkIGEgc2V0X2NoYW5uZWwgY2FsbC4gVGhlDQo+IGNh
bGxiYWNrIG1pZ2h0IGJlIGNhbGxlZCwgYnV0IGl0IHdvbid0IG1hdHRlcg0KPiBhcyBub3RoaW5n
IGNhbiB1c2UgdGhlIGNoYW5uZWwuDQoNCldlIHN0aWxsIG5lZWQgdGhpcyBzZXRfY2hhbm5lbCBo
YW5kZXIgZm9yIHN0YXRpb24gSUJTUyBtb2RlLg0KVXNlciBtYXkgd2FudCB0byB1c2UgIml3IG1s
YW4wIHNldCBjaGFubmVsIDExIiBjb21tYW5kIHRvIGNvbmZpZ3VyZSB0aGUgY2hhbm5lbCBiZWZv
cmUgc3RhcnRpbmcgYW4gSUJTUyBuZXR3b3JrLg0KDQpUaGFua3MsDQpCaW5nDQoNCg==

RE: [PATCH] mwifiex: remove set_channel cfg80211 hook

[Johannes Berg]

On Fri, 2012-05-11 at 11:21 -0700, Bing Zhao wrote:
> Hi Johannes,
> 
> > From: Johannes Berg <johannes.berg@intel.com>
> > 
> > Since mwifiex only supports managed and IBSS
> > modes, it doesn't need a set_channel call. The
> > callback might be called, but it won't matter
> > as nothing can use the channel.
> 
> We still need this set_channel hander for station IBSS mode.
> User may want to use "iw mlan0 set channel 11" command to configure the channel before starting an IBSS network.

That doesn't make sense though, since you should give the channel to
join the IBSS?

iw mlan0 ibss join <SSID> 2462

So maybe mwifiex_cfg80211_join_ibss() should use the channel it gets
instead.

johannes

RE: [PATCH] mwifiex: remove set_channel cfg80211 hook

[Johannes Berg]

On Fri, 2012-05-11 at 20:26 +0200, Johannes Berg wrote:
> On Fri, 2012-05-11 at 11:21 -0700, Bing Zhao wrote:
> > Hi Johannes,
> > 
> > > From: Johannes Berg <johannes.berg@intel.com>
> > > 
> > > Since mwifiex only supports managed and IBSS
> > > modes, it doesn't need a set_channel call. The
> > > callback might be called, but it won't matter
> > > as nothing can use the channel.
> > 
> > We still need this set_channel hander for station IBSS mode.
> > User may want to use "iw mlan0 set channel 11" command to configure the channel before starting an IBSS network.
> 
> That doesn't make sense though, since you should give the channel to
> join the IBSS?
> 
> iw mlan0 ibss join <SSID> 2462
> 
> So maybe mwifiex_cfg80211_join_ibss() should use the channel it gets
> instead.

Never mind, it already does. And thereby overrides anything you did with
"iw mlan0 set channel 11".

johannes

RE: [PATCH] mwifiex: remove set_channel cfg80211 hook

[Bing Zhao]

SGkgSm9oYW5uZXMsDQoNCj4gPiA+ID4gRnJvbTogSm9oYW5uZXMgQmVyZyA8am9oYW5uZXMuYmVy
Z0BpbnRlbC5jb20+DQo+ID4gPiA+DQo+ID4gPiA+IFNpbmNlIG13aWZpZXggb25seSBzdXBwb3J0
cyBtYW5hZ2VkIGFuZCBJQlNTDQo+ID4gPiA+IG1vZGVzLCBpdCBkb2Vzbid0IG5lZWQgYSBzZXRf
Y2hhbm5lbCBjYWxsLiBUaGUNCj4gPiA+ID4gY2FsbGJhY2sgbWlnaHQgYmUgY2FsbGVkLCBidXQg
aXQgd29uJ3QgbWF0dGVyDQo+ID4gPiA+IGFzIG5vdGhpbmcgY2FuIHVzZSB0aGUgY2hhbm5lbC4N
Cj4gPiA+DQo+ID4gPiBXZSBzdGlsbCBuZWVkIHRoaXMgc2V0X2NoYW5uZWwgaGFuZGVyIGZvciBz
dGF0aW9uIElCU1MgbW9kZS4NCj4gPiA+IFVzZXIgbWF5IHdhbnQgdG8gdXNlICJpdyBtbGFuMCBz
ZXQgY2hhbm5lbCAxMSIgY29tbWFuZCB0byBjb25maWd1cmUgdGhlIGNoYW5uZWwgYmVmb3JlIHN0
YXJ0aW5nDQo+IGFuIElCU1MgbmV0d29yay4NCj4gPg0KPiA+IFRoYXQgZG9lc24ndCBtYWtlIHNl
bnNlIHRob3VnaCwgc2luY2UgeW91IHNob3VsZCBnaXZlIHRoZSBjaGFubmVsIHRvDQo+ID4gam9p
biB0aGUgSUJTUz8NCj4gPg0KPiA+IGl3IG1sYW4wIGlic3Mgam9pbiA8U1NJRD4gMjQ2Mg0KDQpI
bW0sIHRoYXQncyB0cnVlLg0KDQo+ID4NCj4gPiBTbyBtYXliZSBtd2lmaWV4X2NmZzgwMjExX2pv
aW5faWJzcygpIHNob3VsZCB1c2UgdGhlIGNoYW5uZWwgaXQgZ2V0cw0KPiA+IGluc3RlYWQuDQo+
IA0KPiBOZXZlciBtaW5kLCBpdCBhbHJlYWR5IGRvZXMuIEFuZCB0aGVyZWJ5IG92ZXJyaWRlcyBh
bnl0aGluZyB5b3UgZGlkIHdpdGgNCj4gIml3IG1sYW4wIHNldCBjaGFubmVsIDExIi4NCg0KSSds
bCBhY2sgeW91ciBwYXRjaCB0aGVuLg0KDQpUaGFua3MsDQpCaW5nDQoNCg0K

RE: [PATCH] mwifiex: remove set_channel cfg80211 hook

[Bing Zhao]

PiBGcm9tOiBKb2hhbm5lcyBCZXJnIDxqb2hhbm5lcy5iZXJnQGludGVsLmNvbT4NCj4gDQo+IFNp
bmNlIG13aWZpZXggb25seSBzdXBwb3J0cyBtYW5hZ2VkIGFuZCBJQlNTDQo+IG1vZGVzLCBpdCBk
b2Vzbid0IG5lZWQgYSBzZXRfY2hhbm5lbCBjYWxsLiBUaGUNCj4gY2FsbGJhY2sgbWlnaHQgYmUg
Y2FsbGVkLCBidXQgaXQgd29uJ3QgbWF0dGVyDQo+IGFzIG5vdGhpbmcgY2FuIHVzZSB0aGUgY2hh
bm5lbC4NCj4gDQo+IFNpZ25lZC1vZmYtYnk6IEpvaGFubmVzIEJlcmcgPGpvaGFubmVzLmJlcmdA
aW50ZWwuY29tPg0KDQpBY2tlZC1ieTogQmluZyBaaGFvIDxiemhhb0BtYXJ2ZWxsLmNvbT4NCg0K
DQpIaSBKb2huLA0KDQpUaGlzIHBhdGNoIGFwcGxpZXMgd2VsbCBiZWZvcmUgdGhlIG13aWZpZXgg
QVAgcGF0Y2hzZXQgKDE4IHBhdGNoZXMpLg0KDQpUaGFua3MsDQpCaW5nDQoNCj4gLS0tDQo+ICBk
cml2ZXJzL25ldC93aXJlbGVzcy9td2lmaWV4L2NmZzgwMjExLmMgfCAgIDI3IC0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLQ0KPiAgMSBmaWxlIGNoYW5nZWQsIDI3IGRlbGV0aW9ucygtKQ0KPiAN
Cj4gLS0tIGEvZHJpdmVycy9uZXQvd2lyZWxlc3MvbXdpZmlleC9jZmc4MDIxMS5jCTIwMTItMDUt
MTEgMTg6MDI6NDEuMDAwMDAwMDAwICswMjAwDQo+ICsrKyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNz
L213aWZpZXgvY2ZnODAyMTEuYwkyMDEyLTA1LTExIDE4OjM2OjM4LjAwMDAwMDAwMCArMDIwMA0K
PiBAQCAtMzY1LDMyICszNjUsNiBAQCBtd2lmaWV4X3NldF9yZl9jaGFubmVsKHN0cnVjdCBtd2lm
aWV4X3ByDQo+ICB9DQo+IA0KPiAgLyoNCj4gLSAqIENGRzgwMi4xMSBvcGVyYXRpb24gaGFuZGxl
ciB0byBzZXQgY2hhbm5lbC4NCj4gLSAqDQo+IC0gKiBUaGlzIGZ1bmN0aW9uIGNhbiBvbmx5IGJl
IHVzZWQgd2hlbiBzdGF0aW9uIGlzIG5vdCBjb25uZWN0ZWQuDQo+IC0gKi8NCj4gLXN0YXRpYyBp
bnQNCj4gLW13aWZpZXhfY2ZnODAyMTFfc2V0X2NoYW5uZWwoc3RydWN0IHdpcGh5ICp3aXBoeSwg
c3RydWN0IG5ldF9kZXZpY2UgKmRldiwNCj4gLQkJCSAgICAgc3RydWN0IGllZWU4MDIxMV9jaGFu
bmVsICpjaGFuLA0KPiAtCQkJICAgICBlbnVtIG5sODAyMTFfY2hhbm5lbF90eXBlIGNoYW5uZWxf
dHlwZSkNCj4gLXsNCj4gLQlzdHJ1Y3QgbXdpZmlleF9wcml2YXRlICpwcml2Ow0KPiAtDQo+IC0J
aWYgKGRldikNCj4gLQkJcHJpdiA9IG13aWZpZXhfbmV0ZGV2X2dldF9wcml2KGRldik7DQo+IC0J
ZWxzZQ0KPiAtCQlwcml2ID0gbXdpZmlleF9jZmc4MDIxMV9nZXRfcHJpdih3aXBoeSk7DQo+IC0N
Cj4gLQlpZiAocHJpdi0+bWVkaWFfY29ubmVjdGVkKSB7DQo+IC0JCXdpcGh5X2Vycih3aXBoeSwg
IlRoaXMgc2V0dGluZyBpcyB2YWxpZCBvbmx5IHdoZW4gc3RhdGlvbiAiDQo+IC0JCQkJImlzIG5v
dCBjb25uZWN0ZWRcbiIpOw0KPiAtCQlyZXR1cm4gLUVJTlZBTDsNCj4gLQl9DQo+IC0NCj4gLQly
ZXR1cm4gbXdpZmlleF9zZXRfcmZfY2hhbm5lbChwcml2LCBjaGFuLCBjaGFubmVsX3R5cGUpOw0K
PiAtfQ0KPiAtDQo+IC0vKg0KPiAgICogVGhpcyBmdW5jdGlvbiBzZXRzIHRoZSBmcmFnbWVudGF0
aW9uIHRocmVzaG9sZC4NCj4gICAqDQo+ICAgKiBUaGUgZnJhZ21lbnRhdGlvbiB0aHJlc2hvbGQg
dmFsdWUgbXVzdCBsaWUgYmV0d2VlbiBNV0lGSUVYX0ZSQUdfTUlOX1ZBTFVFDQo+IEBAIC0xNDE3
LDcgKzEzOTEsNiBAQCBzdGF0aWMgc3RydWN0IGNmZzgwMjExX29wcyBtd2lmaWV4X2NmZzgwDQo+
ICAJLmdldF9zdGF0aW9uID0gbXdpZmlleF9jZmc4MDIxMV9nZXRfc3RhdGlvbiwNCj4gIAkuZHVt
cF9zdGF0aW9uID0gbXdpZmlleF9jZmc4MDIxMV9kdW1wX3N0YXRpb24sDQo+ICAJLnNldF93aXBo
eV9wYXJhbXMgPSBtd2lmaWV4X2NmZzgwMjExX3NldF93aXBoeV9wYXJhbXMsDQo+IC0JLnNldF9j
aGFubmVsID0gbXdpZmlleF9jZmc4MDIxMV9zZXRfY2hhbm5lbCwNCj4gIAkuam9pbl9pYnNzID0g
bXdpZmlleF9jZmc4MDIxMV9qb2luX2lic3MsDQo+ICAJLmxlYXZlX2lic3MgPSBtd2lmaWV4X2Nm
ZzgwMjExX2xlYXZlX2lic3MsDQo+ICAJLmFkZF9rZXkgPSBtd2lmaWV4X2NmZzgwMjExX2FkZF9r
ZXksDQo+IA0KDQo=