linux-toradex.git/net/nfc, branch v3.6 Linux kernel for Apalis and Colibri modules Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-07-20T16:30:48+00:00 John W. Linville linville@tuxdriver.com 2012-07-20T16:30:48+00:00 90b90f60c4f8e3a8525dfeb4aec46a9c7a29c857 






Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2012-07-17T19:31:33+00:00

John W. Linville
linville@tuxdriver.com

2012-07-17T19:31:33+00:00

d369f7b2b257ad6369b72d39e2f989833754a9ce












NFC: NCI module license 'unspecified' taints kernel
2012-07-12T18:48:41+00:00

Dave Jones
davej@redhat.com

2012-07-12T17:17:34+00:00

8a70e7f8f3081770238fbe19f78116af1d4b0652

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>





Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>







NFC: Set target nfcid1 for all HCI reader A targets
2012-07-12T18:48:41+00:00

Eric Lapuyade
eric.lapuyade@intel.com

2012-07-12T18:27:54+00:00

81b3039557faf1359f40494003aaade745de6c24

Without the discovered target nfcid1 and its length set properly, type 2
tags detection fails with the pn544 as it checks for them from
pn544_hci_complete_target_discovered().

Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com>
Reported-by: Mathias Jeppsson <mathias.jeppsson@sonymobile.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>





Without the discovered target nfcid1 and its length set properly, type 2
tags detection fails with the pn544 as it checks for them from
pn544_hci_complete_target_discovered().

Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com>
Reported-by: Mathias Jeppsson <mathias.jeppsson@sonymobile.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>







Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2012-07-12T17:44:50+00:00

John W. Linville
linville@tuxdriver.com

2012-07-12T17:44:50+00:00

38a00840638b4932152bca48098dbfa069d942a2












Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-07-11T06:56:33+00:00

David S. Miller
davem@davemloft.net

2012-07-11T06:56:33+00:00

04c9f416e371cff076a8b3279fb213628915d059

Conflicts:
	net/batman-adv/bridge_loop_avoidance.c
	net/batman-adv/bridge_loop_avoidance.h
	net/batman-adv/soft-interface.c
	net/mac80211/mlme.c

With merge help from Antonio Quartulli (batman-adv) and
Stephen Rothwell (drivers/net/usb/qmi_wwan.c).

The net/mac80211/mlme.c conflict seemed easy enough, accounting for a
conversion to some new tracing macros.

Signed-off-by: David S. Miller <davem@davemloft.net>





Conflicts:
	net/batman-adv/bridge_loop_avoidance.c
	net/batman-adv/bridge_loop_avoidance.h
	net/batman-adv/soft-interface.c
	net/mac80211/mlme.c

With merge help from Antonio Quartulli (batman-adv) and
Stephen Rothwell (drivers/net/usb/qmi_wwan.c).

The net/mac80211/mlme.c conflict seemed easy enough, accounting for a
conversion to some new tracing macros.

Signed-off-by: David S. Miller <davem@davemloft.net>







NFC: Fix order of arguments to list_add_tail() when queueing HCP frames
2012-07-10T15:42:51+00:00

Mathias Jeppsson
mathias.jeppsson@sonymobile.com

2012-07-06T22:53:19+00:00

f8bf65bf3688835f95f7c74f5c844a64b2743a42

The HCP message should be added to transmit queue, not the other way around.

Signed-off-by: Mathias Jeppsson <mathias.jeppsson@sonymobile.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>





The HCP message should be added to transmit queue, not the other way around.

Signed-off-by: Mathias Jeppsson <mathias.jeppsson@sonymobile.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>







NFC: Fix empty HCI message list check
2012-07-10T15:42:50+00:00

Mathias Jeppsson
mathias.jeppsson@sonymobile.com

2012-07-06T22:53:18+00:00

1913e57cf9a7be4565c56a3fbfd85106919ea006

list_first_entry() will never return NULL. Instead use
list_for_each_entry_safe() to iterate through the list.

Signed-off-by: Mathias Jeppsson <mathias.jeppsson@sonymobile.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>





list_first_entry() will never return NULL. Instead use
list_for_each_entry_safe() to iterate through the list.

Signed-off-by: Mathias Jeppsson <mathias.jeppsson@sonymobile.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>







NFC: Check for llcp_sock and its device from llcp_sock_getname
2012-07-09T20:42:25+00:00

Samuel Ortiz
sameo@linux.intel.com

2012-07-05T15:43:08+00:00

fe3c094abc2365a226184554501fe0df87fe8271

They both can potentially be NULL.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>





They both can potentially be NULL.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>







NFC: Add ISO 14443 type B protocol
2012-07-09T20:42:24+00:00

Samuel Ortiz
sameo@linux.intel.com

2012-07-03T22:14:04+00:00

01d719a2287ec34f631800d10f1fad3c134c3e89

Some devices (e.g. Sony's PaSoRi) can not do type B polling, so we have
to make a distinction between ISO14443 type A and B poll modes.

Cc: Eric Lapuyade <eric.lapuyade@intel.com>
Cc: Ilan Elias <ilane@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>





Some devices (e.g. Sony's PaSoRi) can not do type B polling, so we have
to make a distinction between ISO14443 type A and B poll modes.

Cc: Eric Lapuyade <eric.lapuyade@intel.com>
Cc: Ilan Elias <ilane@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>