linux.git/net/nfc, branch v3.5-rc2

NFC: Queue I frame fragments to the LLCP sockets queue tail

2012-05-16T17:08:14+00:00

After testing our stack with large SNEP messages, we realized the fragments
were arriving in reversed order.

Signed-off-by: Samuel Ortiz 
Signed-off-by: John W. Linville

NFC: HCI drivers don't have to keep track of polling state

2012-05-15T21:31:22+00:00

The NFC core code already does that for them.

Signed-off-by: Eric Lapuyade 
Signed-off-by: Samuel Ortiz 
Signed-off-by: John W. Linville

NFC: The NFC genl family structure should not be exposed globally

2012-05-15T21:30:30+00:00

The variable 'nfc_genl_family' is only referenced in this file and
should be marked static to prevent it from being exposed globally.

Quites the sparse warning:

warning: symbol 'nfc_genl_family' was not declared. Should it be static?

Signed-off-by: H Hartley Sweeten 
Cc: Lauro Ramos Venancio 
Cc: Aloisio Almeida Jr 
Cc: Samuel Ortiz 
Cc: "David S. Miller" 
Signed-off-by: Samuel Ortiz 
Signed-off-by: John W. Linville

NFC: HCI ops should not be exposed globally

2012-05-15T21:30:30+00:00

The variable 'hci_nfc_ops' is only referenced in this file and
should be marked static to prevent it from being exposed globally.

Quites the sparse warning:

warning: symbol 'hci_nfc_ops' was not declared. Should it be static?

Signed-off-by: H Hartley Sweeten 
Cc: Lauro Ramos Venancio 
Cc: Aloisio Almeida Jr 
Cc: Samuel Ortiz 
Cc: "David S. Miller" 
Signed-off-by: Samuel Ortiz 
Signed-off-by: John W. Linville

NFC: Quiet nci/ntf.c sparse noise about plain integer as NULL pointer

2012-05-15T21:30:30+00:00

Pointers should be cleared with NULL, not 0.

Quiets a couple sparse warnings of the type:

warning: Using plain integer as NULL pointer

Signed-off-by: H Hartley Sweeten 
Cc: Lauro Ramos Venancio 
Cc: Aloisio Almeida Jr 
Cc: Samuel Ortiz 
Cc: "David S. Miller" 
Signed-off-by: Samuel Ortiz 
Signed-off-by: John W. Linville

NFC: Include nci_core.h to nci/lib.c

2012-05-15T21:30:29+00:00

Include the header to pickup the exported symbol prototype.

Quites the sparse warning:

warning: symbol 'nci_to_errno' was not declared. Should it be static?

Signed-off-by: H Hartley Sweeten 
Cc: Lauro Ramos Venancio 
Cc: Aloisio Almeida Jr 
CC: Samuel Ortiz 
CC: "David S. Miller" 
Signed-off-by: Samuel Ortiz 
Signed-off-by: John W. Linville

NFC: Quiet nci/data.c sparse noise about plain integer as NULL pointer

2012-05-15T21:30:29+00:00

Pointers should be cleared with NULL, not 0.

Quiets a couple sparse warnings of the type:

warning: Using plain integer as NULL pointer

Signed-off-by: H Hartley Sweeten 
Cc: Lauro Ramos Venancio 
Cc: Aloisio Almeida Jr 
Cc: Samuel Ortiz 
Cc: "David S. Miller" 
Signed-off-by: Samuel Ortiz 
Signed-off-by: John W. Linville

NFC: Fix LLCP compilation warning

2012-05-15T21:30:29+00:00

nfc_llcp_general_bytes is defined in nfc/core.c as:
nfc_llcp_general_bytes(struct nfc_dev *dev, size_t *gb_len).

as in nfc/nfc.h:
nfc_llcp_general_bytes(struct nfc_dev *dev, u8 *gb_len), if CONFIG_NFC_LLCP
is not defined.

so we got some warnings,
net/nfc/core.c:207:2: warning: passing argument 2 of ‘nfc_llcp_general_bytes’ from incompatible pointer type [enabled by default]
net/nfc/nfc.h:87:19: note: expected ‘u8 *’ but argument is of type ‘size_t *’

Signed-off-by: joseph daniel 
Signed-off-by: Samuel Ortiz 
Signed-off-by: John W. Linville

NFC: Return the amount of LLCP bytes queued to sock_sendmsg

2012-05-15T21:28:02+00:00

Otherwise an LLCP send() always returns 0.

Signed-off-by: Samuel Ortiz 
Signed-off-by: John W. Linville

NFC: Update the LLCP poll mask

2012-05-15T21:28:02+00:00

Fix the poll mask depending on the socket state. POLLOUT was missing
for example.

Signed-off-by: Samuel Ortiz 
Signed-off-by: John W. Linville