Skip to contentSkip to conversation

compat-wireless: fix 07-change-default-rate-alg.patch

PATCH In review Bruno Randolf 3 participants 5 messages May 13, 2010 – May 14, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 compat-wireless: fix 07-change-default-rate-alg.patch

i need this change to make it apply again

---
 patches/07-change-default-rate-alg.patch |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
patches/07-change-default-rate-alg.patch +5 -5
index f0ccbce..f73a4c5 100644
@@ -10,9 +10,9 @@ and define CONFIG_COMPAT_MAC80211_RC_DEFAULT on config.mk.
 Through the compat autoconf we then get it also defined there
 at compilation time.
 
---- a/net/mac80211/rate.c
-+++ b/net/mac80211/rate.c
-@@ -23,7 +23,7 @@ struct rate_control_alg {
+--- a/net/mac80211/rate.c	2010-05-12 16:27:02.245747971 +0900
++++ b/net/mac80211/rate.c	2010-05-12 17:00:45.855748158 +0900
+@@ -23,7 +23,7 @@
  static LIST_HEAD(rate_ctrl_algs);
  static DEFINE_MUTEX(rate_ctrl_mutex);
  
@@ -21,7 +21,7 @@ at compilation time.
  module_param(ieee80211_default_rc_algo, charp, 0644);
  MODULE_PARM_DESC(ieee80211_default_rc_algo,
  		 "Default rate control algorithm for mac80211 to use");
-@@ -119,8 +119,8 @@ ieee80211_rate_control_ops_get(const cha
+@@ -118,8 +118,8 @@
  		ops = ieee80211_try_rate_control_ops_get(ieee80211_default_rc_algo);
  
  	/* try built-in one if specific alg requested but not found */
@@ -29,6 +29,6 @@ at compilation time.
 -		ops = ieee80211_try_rate_control_ops_get(CONFIG_MAC80211_RC_DEFAULT);
 +	if (!ops && strlen(CONFIG_COMPAT_MAC80211_RC_DEFAULT))
 +		ops = ieee80211_try_rate_control_ops_get(CONFIG_COMPAT_MAC80211_RC_DEFAULT);
- 	kparam_unblock_sysfs_write(ieee80211_default_rc_algo);
  
  	return ops;
+ }
#2 lore raw
In reply to Bruno Randolf

Am 13.05.2010 03:17, schrieb Bruno Randolf:

Quoted 35 lines

i need this change to make it apply again

---
 patches/07-change-default-rate-alg.patch |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
patches/07-change-default-rate-alg.patch +4 -4
index f0ccbce..f73a4c5 100644
@@ -10,9 +10,9 @@ and define CONFIG_COMPAT_MAC80211_RC_DEFAULT on config.mk.
 Through the compat autoconf we then get it also defined there
 at compilation time.
 
---- a/net/mac80211/rate.c
-+++ b/net/mac80211/rate.c
-@@ -23,7 +23,7 @@ struct rate_control_alg {
+--- a/net/mac80211/rate.c	2010-05-12 16:27:02.245747971 +0900
++++ b/net/mac80211/rate.c	2010-05-12 17:00:45.855748158 +0900
+@@ -23,7 +23,7 @@
  static LIST_HEAD(rate_ctrl_algs);
  static DEFINE_MUTEX(rate_ctrl_mutex);
 
@@ -21,7 +21,7 @@ at compilation time.
  module_param(ieee80211_default_rc_algo, charp, 0644);
  MODULE_PARM_DESC(ieee80211_default_rc_algo,
  		 "Default rate control algorithm for mac80211 to use");
-@@ -119,8 +119,8 @@ ieee80211_rate_control_ops_get(const cha
+@@ -118,8 +118,8 @@
  		ops = ieee80211_try_rate_control_ops_get(ieee80211_default_rc_algo);
 
  	/* try built-in one if specific alg requested but not found */

patches/07-change-default-rate-alg.patch at compilation time. · line 34

Quoted 7 lines
patches/07-change-default-rate-alg.patch +1 -1
@@ -29,6 +29,6 @@ at compilation time.
 -		ops = ieee80211_try_rate_control_ops_get(CONFIG_MAC80211_RC_DEFAULT);
 +	if (!ops && strlen(CONFIG_COMPAT_MAC80211_RC_DEFAULT))
 +		ops = ieee80211_try_rate_control_ops_get(CONFIG_COMPAT_MAC80211_RC_DEFAULT);
- 	kparam_unblock_sysfs_write(ieee80211_default_rc_algo);
 
  	return ops;
+ }

Hi Bruno,

For me it does not apply any more against linux-next with your patch, without your patch it still applies.

In the linux-next tree there is this line kparam_unblock_sysfs_write(ieee80211_default_rc_algo);
it was introduced 2 days ago. In wireless-text this does not exist for now.

Could it be that you tried to generate compat-wireless out of wireless-testing and not linux-next?

Please run "./scripts/admin-refresh.sh refresh" after changing a patch to format it automatically in a common way.

Hauke

#3 lore raw
Quoted 34 lines · On Thursday 13 May 2010 20:48:30 Hauke Mehrtens wrote:

Am 13.05.2010 03:17, schrieb Bruno Randolf:

Quoted 33 lines

i need this change to make it apply again

---

 patches/07-change-default-rate-alg.patch |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
(quoted diff) +0 -0

b/patches/07-change-default-rate-alg.patch index f0ccbce..f73a4c5 100644

patches/07-change-default-rate-alg.patch +0 -0
@@ -10,9 +10,9 @@ and define CONFIG_COMPAT_MAC80211_RC_DEFAULT on

config.mk.

Through the compat autoconf we then get it also defined there at compilation time.

---- a/net/mac80211/rate.c
-+++ b/net/mac80211/rate.c
-@@ -23,7 +23,7 @@ struct rate_control_alg {
+--- a/net/mac80211/rate.c 2010-05-12 16:27:02.245747971 +0900
++++ b/net/mac80211/rate.c 2010-05-12 17:00:45.855748158 +0900
+@@ -23,7 +23,7 @@

  static LIST_HEAD(rate_ctrl_algs);
  static DEFINE_MUTEX(rate_ctrl_mutex);
patches/07-change-default-rate-alg.patch +0 -0
@@ -21,7 +21,7 @@ at compilation time.
 
  module_param(ieee80211_default_rc_algo, charp, 0644);
  MODULE_PARM_DESC(ieee80211_default_rc_algo,
 
Quoted 6 lines
Quoted 6 lines
patches/07-change-default-rate-alg.patch +1 -1
  		 "Default rate control algorithm for mac80211 to use");
 
-@@ -119,8 +119,8 @@ ieee80211_rate_control_ops_get(const cha
+@@ -118,8 +118,8 @@

ops =

ieee80211_try_rate_control_ops_get(ieee80211_default_rc_algo);

Quoted 6 lines

patches/07-change-default-rate-alg.patch at compilation time. · line 30

Quoted 6 lines

/* try built-in one if specific alg requested but not found */

patches/07-change-default-rate-alg.patch +0 -0
@@ -29,6 +29,6 @@ at compilation time.
 
 -		ops = 

ieee80211_try_rate_control_ops_get(CONFIG_MAC80211_RC_DEFAULT);

Quoted 19 lines

patches/07-change-default-rate-alg.patch at compilation time. · line 34

Quoted 9 lines
patches/07-change-default-rate-alg.patch +1 -1
 +	if (!ops && strlen(CONFIG_COMPAT_MAC80211_RC_DEFAULT))
 +		ops =
 ieee80211_try_rate_control_ops_get(CONFIG_COMPAT_MAC80211_RC_DEFAULT);
 
- 	kparam_unblock_sysfs_write(ieee80211_default_rc_algo);
 
  	return ops;
 
+ }

Hi Bruno,

For me it does not apply any more against linux-next with your patch, without your patch it still applies.

In the linux-next tree there is this line kparam_unblock_sysfs_write(ieee80211_default_rc_algo);
it was introduced 2 days ago. In wireless-text this does not exist for now.

Quoted 5 lines

Could it be that you tried to generate compat-wireless out of wireless-testing and not linux-next?

Please run "./scripts/admin-refresh.sh refresh" after changing a patch to format it automatically in a common way.

yes, i used wireless-testing - sorry!

is compat-wireless meant to be used only with linux-next?

bruno

#4 lore raw
Quoted 71 lines · Bruno Randolf
Quoted 34 lines · On Thursday 13 May 2010 20:48:30 Hauke Mehrtens wrote:

Am 13.05.2010 03:17, schrieb Bruno Randolf:

Quoted 33 lines

i need this change to make it apply again

---

 patches/07-change-default-rate-alg.patch |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
(quoted diff) +0 -0

b/patches/07-change-default-rate-alg.patch index f0ccbce..f73a4c5 100644

patches/07-change-default-rate-alg.patch +0 -0
@@ -10,9 +10,9 @@ and define CONFIG_COMPAT_MAC80211_RC_DEFAULT on

config.mk.

Through the compat autoconf we then get it also defined there at compilation time.

---- a/net/mac80211/rate.c
-+++ b/net/mac80211/rate.c
-@@ -23,7 +23,7 @@ struct rate_control_alg {
+--- a/net/mac80211/rate.c 2010-05-12 16:27:02.245747971 +0900
++++ b/net/mac80211/rate.c 2010-05-12 17:00:45.855748158 +0900
+@@ -23,7 +23,7 @@

  static LIST_HEAD(rate_ctrl_algs);
  static DEFINE_MUTEX(rate_ctrl_mutex);
patches/07-change-default-rate-alg.patch +0 -0
@@ -21,7 +21,7 @@ at compilation time.
 
  module_param(ieee80211_default_rc_algo, charp, 0644);
  MODULE_PARM_DESC(ieee80211_default_rc_algo,
 
Quoted 6 lines
Quoted 6 lines
patches/07-change-default-rate-alg.patch +1 -1
  		 "Default rate control algorithm for mac80211 to use");
 
-@@ -119,8 +119,8 @@ ieee80211_rate_control_ops_get(const cha
+@@ -118,8 +118,8 @@

ops =

ieee80211_try_rate_control_ops_get(ieee80211_default_rc_algo);

Quoted 6 lines

patches/07-change-default-rate-alg.patch at compilation time. · line 30

Quoted 6 lines

/* try built-in one if specific alg requested but not found */

patches/07-change-default-rate-alg.patch +0 -0
@@ -29,6 +29,6 @@ at compilation time.
 
 -		ops = 

ieee80211_try_rate_control_ops_get(CONFIG_MAC80211_RC_DEFAULT);

Quoted 22 lines

patches/07-change-default-rate-alg.patch at compilation time. · line 34

Quoted 9 lines
patches/07-change-default-rate-alg.patch +1 -1
 +	if (!ops && strlen(CONFIG_COMPAT_MAC80211_RC_DEFAULT))
 +		ops =
 ieee80211_try_rate_control_ops_get(CONFIG_COMPAT_MAC80211_RC_DEFAULT);
 
- 	kparam_unblock_sysfs_write(ieee80211_default_rc_algo);
 
  	return ops;
 
+ }

Hi Bruno,

For me it does not apply any more against linux-next with your patch, without your patch it still applies.

In the linux-next tree there is this line kparam_unblock_sysfs_write(ieee80211_default_rc_algo);
it was introduced 2 days ago. In wireless-text this does not exist for now.

Could it be that you tried to generate compat-wireless out of wireless-testing and not linux-next?

Quoted 6 lines
Quoted 2 lines

Please run "./scripts/admin-refresh.sh refresh" after changing a patch to format it automatically in a common way.

yes, i used wireless-testing - sorry!

is compat-wireless meant to be used only with linux-next?

Yeap

Luis