From: Bruno Randolf <br1@einfach.org>
To: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Cc: Hauke Mehrtens <hauke@hauke-m.de>,
linux-wireless@vger.kernel.org, mcgrof@infradead.org
Subject: Re: [PATCH 2/2] compat-wireless: make patches apply again
Date: Thu, 13 May 2010 10:00:57 +0900 [thread overview]
Message-ID: <201005131000.57369.br1@einfach.org> (raw)
In-Reply-To: <AANLkTinkg1lG6Zc-9CfxABp0DVpTsym1YFKlcFCHTMTE@mail.gmail.com>
On Thursday 13 May 2010 01:28:18 Luis R. Rodriguez wrote:
> On Wed, May 12, 2010 at 1:20 AM, Bruno Randolf <br1@einfach.org> wrote:
> > On Tuesday 11 May 2010 06:24:10 Hauke Mehrtens wrote:
> >> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
> >> ---
> >> patches/07-change-default-rate-alg.patch | 4 ++--
> >> 1 files changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/patches/07-change-default-rate-alg.patch
> >> b/patches/07-change-default-rate-alg.patch index af65207..f0ccbce 100644
> >> --- a/patches/07-change-default-rate-alg.patch
> >> +++ b/patches/07-change-default-rate-alg.patch
> >> @@ -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");
> >> -@@ -118,8 +118,8 @@ ieee80211_rate_control_ops_get(const cha
> >> +@@ -119,8 +119,8 @@ ieee80211_rate_control_ops_get(const cha
> >> 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;
> >> - }
> >
> > this is somehow messed up and doesn't apply. here is a fixed version of
> > the patch (not a patch for a patch)...
>
> Odd, it applied, here with git am and all. Hm, oh well.
sorry, i wasn't clear about it. the patch from the mail obviously applied and
i got it by git pull. but the resulting patch "07-change-default-rate-
alg.patch" does not apply any more, so i sent a fixed up version of that file.
bruno
next prev parent reply other threads:[~2010-05-13 1:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-10 21:24 [PATCH 1/2] compat-wireless: backport pm_qos_{add,remove,update}_request Hauke Mehrtens
2010-05-10 21:24 ` [PATCH 2/2] compat-wireless: make patches apply again Hauke Mehrtens
2010-05-12 8:20 ` Bruno Randolf
2010-05-12 16:28 ` Luis R. Rodriguez
2010-05-13 1:00 ` Bruno Randolf [this message]
2010-05-13 1:06 ` Luis R. Rodriguez
2010-05-10 22:24 ` [PATCH 1/2] compat-wireless: backport pm_qos_{add,remove,update}_request Luis R. Rodriguez
-- strict thread matches above, loose matches on Subject: below --
2010-10-18 20:36 [PATCH 1/2] compat-wireless: backport sock_recv_ts_and_drops in compat Hauke Mehrtens
2010-10-18 20:36 ` [PATCH 2/2] compat-wireless: make patches apply again Hauke Mehrtens
2011-04-07 14:39 [PATCH 1/2] compat-wireless: Remove extra config option for kfifo Hauke Mehrtens
2011-04-07 14:39 ` [PATCH 2/2] compat-wireless: make patches apply again Hauke Mehrtens
2011-04-15 0:56 ` Luis R. Rodriguez
2011-11-24 19:47 [PATCH 1/2] compat-wireless: add config var for CORDIC and CRC8 Hauke Mehrtens
2011-11-24 19:47 ` [PATCH 2/2] compat-wireless: make patches apply again Hauke Mehrtens
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201005131000.57369.br1@einfach.org \
--to=br1@einfach.org \
--cc=hauke@hauke-m.de \
--cc=linux-wireless@vger.kernel.org \
--cc=lrodriguez@atheros.com \
--cc=mcgrof@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).