From: David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
To: linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org
Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: pull request: wireless-next 2012-05-03
Date: Thu, 03 May 2012 13:17:07 -0400 (EDT) [thread overview]
Message-ID: <20120503.131707.112550136096227430.davem@davemloft.net> (raw)
In-Reply-To: <20120503.130516.1008806127286088740.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
From: David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
Date: Thu, 03 May 2012 13:05:16 -0400 (EDT)
> Pulled, thanks John.
Actually, I un-pulled. The bluetooth guys are sending crap code
formatting again.
>From 74e05692c9599866d5c8743764544cf77cd1af87 Mon Sep 17 00:00:00 2001
From: Andre Guedes <andre.guedes-430g2QfJUUCGglJvpFV4uA@public.gmane.org>
Date: Tue, 6 Mar 2012 19:37:06 -0300
Subject: [PATCH 007/160] Bluetooth: Check FINDING state in interleaved
discovery
In order to do interleaved discovery we should be in DISCOVERY_
FINDING state. Otherwise, discovery should be stopped.
Signed-off-by: Andre Guedes <andre.guedes-430g2QfJUUCGglJvpFV4uA@public.gmane.org>
Signed-off-by: Gustavo F. Padovan <padovan-Y3ZbgMPKUGA34EUeqzHoZw@public.gmane.org>
...
- if (hdev->discovery.type == DISCOV_TYPE_INTERLEAVED) {
+ if (hdev->discovery.type == DISCOV_TYPE_INTERLEAVED &&
+ hdev->discovery.state == DISCOVERY_FINDING) {
Really, we went through this a million times very recently and I'm
not pulling anything into my tree that has garbage like this in it.
Sorry.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2012-05-03 17:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-03 15:22 pull request: wireless-next 2012-05-03 John W. Linville
[not found] ` <20120503152206.GL9285-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2012-05-03 17:05 ` David Miller
[not found] ` <20120503.130516.1008806127286088740.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2012-05-03 17:17 ` David Miller [this message]
2012-05-03 17:21 ` David Miller
[not found] ` <20120503.131707.112550136096227430.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2012-05-03 17:28 ` John W. Linville
2012-05-03 17:29 ` Joe Perches
2012-05-04 8:57 ` Arend van Spriel
2012-05-04 9:42 ` Joe Perches
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=20120503.131707.112550136096227430.davem@davemloft.net \
--to=davem-ft/pcqaiutieiz0/mpfg9q@public.gmane.org \
--cc=linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.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).