Mark A. Greer 4b4dbca5e4 NFC: digital: Check for NFC-DEP before checking for Type 4 tag ... In digital_in_recv_sel_res(), the code that determines the tag type will interpret bits 7:6 (lsb being b1 as per the Digital Specification) of a SEL RES set to 11b as a Type 4 tag. This is okay except that the neard will interpret the same value as an NFC-DEP device (in src/tag.c:set_tag_type() in the neard source). Make the digital layer's interpretation match neard's interpretation by changing the order of the checks in digital_in_recv_sel_res() so that a value of 11b in bits 7:6 is interpreted as an NFC-DEP device instead of a Type 4 tag. Acked-by: Thierry Escande <thierry.escande@linux.intel.com> Signed-off-by: Mark A. Greer <mgreer@animalcreek.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>		2014-07-21 00:45:03 +02:00
..
6lowpan	6lowpan: introduce new net/6lowpan directory	2014-07-12 01:53:30 +02:00
9p	A bunch of updates and cleanup within the transport layer,	2014-04-11 14:14:57 -07:00
802	neigh: use NEIGH_VAR_INIT in ndo_neigh_setup functions.	2014-01-16 11:31:58 -08:00
8021q	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
appletalk	net: Split sk_no_check into sk_no_check_{rx,tx}	2014-05-23 16:28:53 -04:00
atm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-06-12 14:27:40 -07:00
ax25	net: Fix use after free by removing length arg from sk_data_ready callbacks.	2014-04-11 16:15:36 -04:00
batman-adv	net: add __pskb_copy_fclone and pskb_copy_for_clone	2014-06-11 15:38:02 -07:00
bluetooth	Bluetooth: cmtp: Remove unnecessary null test	2014-07-14 23:00:13 +02:00
bridge	bridge: fix compile error when compiling without IPv6 support	2014-06-12 11:00:24 -07:00
caif	net: Fix use after free by removing length arg from sk_data_ready callbacks.	2014-04-11 16:15:36 -04:00
can	can: add hash based access to single EFF frame filters	2014-05-19 09:38:24 +02:00
ceph	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2014-06-12 23:06:23 -07:00
core	net: Fix save software checksum complete	2014-06-15 01:00:49 -07:00
dcb	net: Use netlink_ns_capable to verify the permisions of netlink messages	2014-04-24 13:44:54 -04:00
dccp	net: Eliminate no_check from protosw	2014-05-23 16:28:53 -04:00
decnet	net: Split sk_no_check into sk_no_check_{rx,tx}	2014-05-23 16:28:53 -04:00
dns_resolver	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-11 16:02:55 -07:00
dsa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
ethernet	net: eth_type_trans() should use skb_header_pointer()	2014-01-16 15:30:31 -08:00
hsr	hsr: replace del_timer by del_timer_sync	2014-03-27 15:28:06 -04:00
ieee802154	6lowpan: introduce new net/6lowpan directory	2014-07-12 01:53:30 +02:00
ipv4	udp: ipv4: do not waste time in __udp4_lib_mcast_demux_lookup	2014-06-13 15:39:24 -07:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-11 16:02:55 -07:00
ipx	net: Split sk_no_check into sk_no_check_{rx,tx}	2014-05-23 16:28:53 -04:00
irda	net: add build-time checks for msg->msg_name size	2014-01-18 23:04:16 -08:00
iucv	af_iucv: correct cleanup if listen backlog is full	2014-05-30 17:35:23 -07:00
key	af_key: Replace comma with semicolon	2014-05-30 17:48:58 -07:00
l2tp	l2tp: call udp{6}_set_csum	2014-06-04 22:46:38 -07:00
lapb
llc	llc: remove noisy WARN from llc_mac_hdr_init	2014-01-28 18:01:32 -08:00
mac80211	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2014-07-10 17:00:24 -04:00
mac802154	mac802154: don't deliver packets to devices that are down	2014-06-11 12:10:19 -07:00
mpls	gre: Call gso_make_checksum	2014-06-04 22:46:38 -07:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-06-12 14:27:40 -07:00
netlabel
netlink	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
netrom	net: Fix use after free by removing length arg from sk_data_ready callbacks.	2014-04-11 16:15:36 -04:00
nfc	NFC: digital: Check for NFC-DEP before checking for Type 4 tag	2014-07-21 00:45:03 +02:00
openvswitch	vxlan: Add support for UDP checksums (v4 sending, v6 zero csums)	2014-06-04 22:46:39 -07:00
packet	net: Use netlink_ns_capable to verify the permisions of netlink messages	2014-04-24 13:44:54 -04:00
phonet	net: Use netlink_ns_capable to verify the permisions of netlink messages	2014-04-24 13:44:54 -04:00
rds	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-06-12 14:27:40 -07:00
rfkill	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2014-05-22 13:58:36 -04:00
rose	net: Fix use after free by removing length arg from sk_data_ready callbacks.	2014-04-11 16:15:36 -04:00
rxrpc	af_rxrpc: Fix XDR length check in rxrpc key demarshalling.	2014-05-16 15:24:47 -04:00
sched	net_sched: drr: warn when qdisc is not work conserving	2014-06-11 15:50:59 -07:00
sctp	net: sctp: fix permissions for rto_alpha and rto_beta knobs	2014-06-15 01:17:32 -07:00
sunrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-06-12 14:27:40 -07:00
tipc	net: add __pskb_copy_fclone and pskb_copy_for_clone	2014-06-11 15:38:02 -07:00
unix	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-06-12 14:27:40 -07:00
vmw_vsock	vsock: Make transport the proto owner	2014-05-05 13:13:50 -04:00
wimax
wireless	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2014-07-10 17:00:24 -04:00
x25	net: Fix use after free by removing length arg from sk_data_ready callbacks.	2014-04-11 16:15:36 -04:00
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
compat.c	net/compat: convert to COMPAT_SYSCALL_DEFINE with changing parameter types	2014-03-06 16:30:45 +01:00
Kconfig	6lowpan: introduce new net/6lowpan directory	2014-07-12 01:53:30 +02:00
Makefile	6lowpan: introduce new net/6lowpan directory	2014-07-12 01:53:30 +02:00
nonet.c
socket.c	net: use SYSCALL_DEFINEx for sys_recv	2014-04-16 15:15:05 -04:00
sysctl_net.c