Hi John,
This is the first batch of NFC fixes for 3.10, and it contains:
- 3 fixes for the NFC MEI support:
* We now depend on the correct Kconfig symbol.
* We register an MEI event callback whenever we enable an NFC device,
otherwise we fail to read anything after an enable/disable cycle.
* We only disable an MEI device from its disable mey_phy_ops,
preventing useless consecutive disable calls.
- An NFC Makefile cleanup, as I forgot to remove a commented out line when
moving the LLCP code to the NFC top level directory.
The following changes since commit 6bb4880d9ef30375da4507aeabd6dc261a2c6c2b:
ath9k: fix draining aggregation tid buffers (2013-05-17 14:31:09 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes.git tags/nfc-fixes-3.10-1
for you to fetch changes up to e3a6b14ceda0207c3405c6266e5177a85c0db044:
NFC: mei: Do not disable MEI devices from their remove routine (2013-05-21 10:48:41 +0200)
----------------------------------------------------------------
Paul Bolle (1):
NFC: Remove commented out LLCP related Makefile line
Samuel Ortiz (3):
NFC: mei_phy depends on INTEL_MEI
NFC: mei_phy: Register event callback when enabling the device
NFC: mei: Do not disable MEI devices from their remove routine
drivers/nfc/Kconfig | 2 +-
drivers/nfc/mei_phy.c | 9 +++++++++
drivers/nfc/microread/mei.c | 20 +++++---------------
drivers/nfc/pn544/mei.c | 20 +++++---------------
net/nfc/Makefile | 1 -
5 files changed, 20 insertions(+), 32 deletions(-)
--
Intel Open Source Technology Centre
http://oss.intel.com/
On Wed, May 22, 2013 at 01:07:11AM +0200, Samuel Ortiz wrote:
> Hi John,
>
> This is the first batch of NFC fixes for 3.10, and it contains:
>
> - 3 fixes for the NFC MEI support:
> * We now depend on the correct Kconfig symbol.
> * We register an MEI event callback whenever we enable an NFC device,
> otherwise we fail to read anything after an enable/disable cycle.
> * We only disable an MEI device from its disable mey_phy_ops,
> preventing useless consecutive disable calls.
>
> - An NFC Makefile cleanup, as I forgot to remove a commented out line when
> moving the LLCP code to the NFC top level directory.
>
> The following changes since commit 6bb4880d9ef30375da4507aeabd6dc261a2c6c2b:
>
> ath9k: fix draining aggregation tid buffers (2013-05-17 14:31:09 -0400)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes.git tags/nfc-fixes-3.10-1
>
> for you to fetch changes up to e3a6b14ceda0207c3405c6266e5177a85c0db044:
>
> NFC: mei: Do not disable MEI devices from their remove routine (2013-05-21 10:48:41 +0200)
Pulling now...
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.
Hi John,
On Wed, Jun 12, 2013 at 02:22:38PM -0400, John W. Linville wrote:
> Given recent events, I'm not sure that this is really acceptable as
> a fix request. The service bit and endianness in particular don't
> sound like they are addressing big problems, and the other two don't
> sound like they are really fixing any regressions either.
>
> Can these wait for 3.11?
I guess so, although they really are fixes.
I'll queue them in nfc-next and will send you a pull request.
Btw, are you going to merge wireless into wireless-next soon ?
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
On Thu, Jun 13, 2013 at 11:02:09AM +0200, Samuel Ortiz wrote:
> Hi John,
>
> On Wed, Jun 12, 2013 at 02:22:38PM -0400, John W. Linville wrote:
> > Given recent events, I'm not sure that this is really acceptable as
> > a fix request. The service bit and endianness in particular don't
> > sound like they are addressing big problems, and the other two don't
> > sound like they are really fixing any regressions either.
> >
> > Can these wait for 3.11?
> I guess so, although they really are fixes.
I don't doubt that they are fixes, but I think that Dave is trying
to clamp down to only 'important' fixes -- data loss, crashes, etc.
> I'll queue them in nfc-next and will send you a pull request.
> Btw, are you going to merge wireless into wireless-next soon ?
I merged the wireless tree into wireless-next yesterday.
John
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.
Given recent events, I'm not sure that this is really acceptable as
a fix request. The service bit and endianness in particular don't
sound like they are addressing big problems, and the other two don't
sound like they are really fixing any regressions either.
Can these wait for 3.11?
John
On Thu, Jun 06, 2013 at 05:20:19PM +0200, Samuel Ortiz wrote:
> Hi John,
>
> This is the 2nd NFC pull request for 3.10.
>
> I wish this one could have been part of the first one, but we came back from
> the NFC plugfest with a few more LLCP fixes:
>
> - The well known services bitmask was sent with the wrong endianness and with
> the first bit not set, which goes against the LLCP specifications. This
> won't prevent most use cases and tests to pass, only picky implementations
> seem to care about the WKS correctness.
>
> - We were ignoring RNRs and were sending our pending frames regardless. We
> should just re-queue them and send a SYMM instead.
>
> - Non blocking LLCP connections were not handled properly as we found out
> after implementing it from neard. Applications were immediatly woken up with
> a SIGHUP and connection failed. This is fixed now, allowing us to have a
> fully asynchronous NFC userspace daemon.
>
> Thanks in advance for pulling them in.
>
> The following changes since commit cee6dfa25831e0daac52fc582a04a7204f886220:
>
> Revert "ath9k_hw: Update rx gain initval to improve rx sensitivity" (2013-06-05 10:42:29 -0400)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes.git tags/nfc-fixes-3.10-2
>
> for you to fetch changes up to fcd335b0010aeafb6e3dfd46360778ce59e1e201:
>
> NFC: llcp: Fix the well known services endianness (2013-06-06 16:43:51 +0200)
>
> ----------------------------------------------------------------
> Samuel Ortiz (4):
> NFC: llcp: Fix non blocking sockets connections
> NFC: llcp: Do not send pending Tx frames when the remote is not ready
> NFC: llcp: Set the LLC Link Management well known service bit
> NFC: llcp: Fix the well known services endianness
>
> net/nfc/llcp.h | 1 +
> net/nfc/llcp_core.c | 8 ++++++--
> net/nfc/llcp_sock.c | 8 +++++---
> 3 files changed, 12 insertions(+), 5 deletions(-)
> --
> Intel Open Source Technology Centre
> http://oss.intel.com/
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.