linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: Luciano Coelho <luciano.coelho@intel.com>
Cc: linux-wireless@vger.kernel.org, sw@simonwunderlich.de,
	yeohchunyeow@gmail.com, yeohchunyeow@cozybit.com,
	andrei.otcheretianski@intel.com
Subject: Re: [PATCH v8 3/5] mac80211: refactor ieee80211_mesh_process_chanswitch()
Date: Thu, 05 Dec 2013 17:05:44 +0100	[thread overview]
Message-ID: <1386259544.4182.14.camel@jlt4.sipsolutions.net> (raw)
In-Reply-To: <1386257143-29840-4-git-send-email-luciano.coelho@intel.com> (sfid-20131205_162558_512881_D06BF6C3)

On Thu, 2013-12-05 at 17:25 +0200, Luciano Coelho wrote:

> +++ b/net/mac80211/util.c
> @@ -2498,7 +2498,6 @@ int ieee80211_send_action_csa(struct ieee80211_sub_if_data *sdata,
>  			ifmsh->pre_value++;
>  		put_unaligned_le16(ifmsh->pre_value, pos);/* Precedence Value */
>  		pos += 2;
> -		ifmsh->chsw_init = true;

Where did this go? I'm asking mostly because mac80211.git has a patch
that changed this code so I'm wondering how to resolve the conflict ...

johannes


  reply	other threads:[~2013-12-05 16:05 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-05 15:25 [PATCH v8 0/5] CSA beacon count changes Luciano Coelho
2013-12-05 15:25 ` [PATCH v8 1/5] mac80211: refactor ieee80211_ibss_process_chanswitch() Luciano Coelho
2013-12-05 15:25 ` [PATCH v8 2/5] mac80211: align ieee80211_ibss_csa_beacon() with ieee80211_csa_beacon() Luciano Coelho
2013-12-07 16:44   ` Jones Desougi
2013-12-05 15:25 ` [PATCH v8 3/5] mac80211: refactor ieee80211_mesh_process_chanswitch() Luciano Coelho
2013-12-05 16:05   ` Johannes Berg [this message]
2013-12-05 19:31     ` Coelho, Luciano
2013-12-05 15:25 ` [PATCH v8 4/5] mac80211: align ieee80211_mesh_csa_beacon() with ieee80211_csa_beacon() Luciano Coelho
2013-12-05 16:04   ` Johannes Berg
2013-12-05 18:53     ` Coelho, Luciano
2013-12-05 18:53       ` Johannes Berg
2013-12-05 19:01         ` Coelho, Luciano
2013-12-05 15:25 ` [PATCH v8 5/5] mac80211: only set CSA beacon when at least one beacon must be transmitted Luciano Coelho
2013-12-05 18:49   ` Simon Wunderlich
2013-12-06 10:34   ` Yeoh Chun-Yeow
2013-12-06 12:03     ` Coelho, Luciano

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=1386259544.4182.14.camel@jlt4.sipsolutions.net \
    --to=johannes@sipsolutions.net \
    --cc=andrei.otcheretianski@intel.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=luciano.coelho@intel.com \
    --cc=sw@simonwunderlich.de \
    --cc=yeohchunyeow@cozybit.com \
    --cc=yeohchunyeow@gmail.com \
    /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).