Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
161ae887
Commit
161ae887
authored
Jun 26, 2012
by
John W. Linville
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-wireless' of
git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0
parents
eac9ac6d
03e934f6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
net/nfc/nci/ntf.c
net/nfc/nci/ntf.c
+5
-5
net/nfc/rawsock.c
net/nfc/rawsock.c
+4
-1
No files found.
net/nfc/nci/ntf.c
View file @
161ae887
...
...
@@ -106,7 +106,7 @@ static __u8 *nci_extract_rf_params_nfca_passive_poll(struct nci_dev *ndev,
nfca_poll
->
sens_res
=
__le16_to_cpu
(
*
((
__u16
*
)
data
));
data
+=
2
;
nfca_poll
->
nfcid1_len
=
*
data
++
;
nfca_poll
->
nfcid1_len
=
min_t
(
__u8
,
*
data
++
,
NFC_NFCID1_MAXSIZE
)
;
pr_debug
(
"sens_res 0x%x, nfcid1_len %d
\n
"
,
nfca_poll
->
sens_res
,
nfca_poll
->
nfcid1_len
);
...
...
@@ -130,7 +130,7 @@ static __u8 *nci_extract_rf_params_nfcb_passive_poll(struct nci_dev *ndev,
struct
rf_tech_specific_params_nfcb_poll
*
nfcb_poll
,
__u8
*
data
)
{
nfcb_poll
->
sensb_res_len
=
*
data
++
;
nfcb_poll
->
sensb_res_len
=
min_t
(
__u8
,
*
data
++
,
NFC_SENSB_RES_MAXSIZE
)
;
pr_debug
(
"sensb_res_len %d
\n
"
,
nfcb_poll
->
sensb_res_len
);
...
...
@@ -145,7 +145,7 @@ static __u8 *nci_extract_rf_params_nfcf_passive_poll(struct nci_dev *ndev,
__u8
*
data
)
{
nfcf_poll
->
bit_rate
=
*
data
++
;
nfcf_poll
->
sensf_res_len
=
*
data
++
;
nfcf_poll
->
sensf_res_len
=
min_t
(
__u8
,
*
data
++
,
NFC_SENSF_RES_MAXSIZE
)
;
pr_debug
(
"bit_rate %d, sensf_res_len %d
\n
"
,
nfcf_poll
->
bit_rate
,
nfcf_poll
->
sensf_res_len
);
...
...
@@ -331,7 +331,7 @@ static int nci_extract_activation_params_iso_dep(struct nci_dev *ndev,
switch
(
ntf
->
activation_rf_tech_and_mode
)
{
case
NCI_NFC_A_PASSIVE_POLL_MODE
:
nfca_poll
=
&
ntf
->
activation_params
.
nfca_poll_iso_dep
;
nfca_poll
->
rats_res_len
=
*
data
++
;
nfca_poll
->
rats_res_len
=
min_t
(
__u8
,
*
data
++
,
20
)
;
pr_debug
(
"rats_res_len %d
\n
"
,
nfca_poll
->
rats_res_len
);
if
(
nfca_poll
->
rats_res_len
>
0
)
{
memcpy
(
nfca_poll
->
rats_res
,
...
...
@@ -341,7 +341,7 @@ static int nci_extract_activation_params_iso_dep(struct nci_dev *ndev,
case
NCI_NFC_B_PASSIVE_POLL_MODE
:
nfcb_poll
=
&
ntf
->
activation_params
.
nfcb_poll_iso_dep
;
nfcb_poll
->
attrib_res_len
=
*
data
++
;
nfcb_poll
->
attrib_res_len
=
min_t
(
__u8
,
*
data
++
,
50
)
;
pr_debug
(
"attrib_res_len %d
\n
"
,
nfcb_poll
->
attrib_res_len
);
if
(
nfcb_poll
->
attrib_res_len
>
0
)
{
memcpy
(
nfcb_poll
->
attrib_res
,
...
...
net/nfc/rawsock.c
View file @
161ae887
...
...
@@ -54,7 +54,10 @@ static int rawsock_release(struct socket *sock)
{
struct
sock
*
sk
=
sock
->
sk
;
pr_debug
(
"sock=%p
\n
"
,
sock
);
pr_debug
(
"sock=%p sk=%p
\n
"
,
sock
,
sk
);
if
(
!
sk
)
return
0
;
sock_orphan
(
sk
);
sock_put
(
sk
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment