From: Luis R. Rodriguez Date: Thu, 8 Jul 2010 19:38:58 +0000 (-0700) Subject: compat-wireless: update 07-change-default-rate-alg.patch X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a348c6d5927d65637887f3e8c6f54874f890bee7;p=openwrt%2Fstaging%2Fblogic.git compat-wireless: update 07-change-default-rate-alg.patch The hunk context changed so it would no longer apply with a fuzz. This required some manual updating of the patch. Signed-off-by: Luis R. Rodriguez --- diff --git a/patches/07-change-default-rate-alg.patch b/patches/07-change-default-rate-alg.patch index 858e1bc01792..cfc8280c38f4 100644 --- a/patches/07-change-default-rate-alg.patch +++ b/patches/07-change-default-rate-alg.patch @@ -12,7 +12,7 @@ at compilation time. --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c -@@ -23,7 +23,7 @@ struct rate_control_alg { +@@ -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 +@@ -119,8 +119,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; - }