NFC: Add node parameter for the new patches fix building error

Due to commit b67bfe0d42cac56c512dd5da4b1b347a23f4b70a
	      hlist: drop the node parameter from iterators
We need to add these parameter to the new code

Change-Id: I68d6842d2b67552c9037d0d2fefff493a05ddbca

diff --git a/net/nfc/llcp/commands.c b/net/nfc/llcp/commands.c
index 094f7e2..a66b516 100644 (file)
--- a/net/nfc/llcp/commands.c
+++ b/net/nfc/llcp/commands.c
@@ -190,9 +190,9 @@ void nfc_llcp_free_sdp_tlv(struct nfc_llcp_sdp_tlv *sdp)
 void nfc_llcp_free_sdp_tlv_list(struct hlist_head *head)
 {
        struct nfc_llcp_sdp_tlv *sdp;
-       struct hlist_node *n;
+       struct hlist_node *hlist, *n;
 
-       hlist_for_each_entry_safe(sdp, n, head, node) {
+       hlist_for_each_entry_safe(sdp, hlist, n, head, node) {
                hlist_del(&sdp->node);
 
                nfc_llcp_free_sdp_tlv(sdp);
@@ -542,14 +542,14 @@ int nfc_llcp_send_snl_sdres(struct nfc_llcp_local *local,
                            struct hlist_head *tlv_list, size_t tlvs_len)
 {
        struct nfc_llcp_sdp_tlv *sdp;
-       struct hlist_node *n;
+       struct hlist_node *hlist, *n;
        struct sk_buff *skb;
 
        skb = nfc_llcp_allocate_snl(local, tlvs_len);
        if (IS_ERR(skb))
                return PTR_ERR(skb);
 
-       hlist_for_each_entry_safe(sdp, n, tlv_list, node) {
+       hlist_for_each_entry_safe(sdp, hlist, n, tlv_list, node) {
                memcpy(skb_put(skb, sdp->tlv_len), sdp->tlv, sdp->tlv_len);
 
                hlist_del(&sdp->node);
@@ -566,7 +566,7 @@ int nfc_llcp_send_snl_sdreq(struct nfc_llcp_local *local,
                            struct hlist_head *tlv_list, size_t tlvs_len)
 {
        struct nfc_llcp_sdp_tlv *sdreq;
-       struct hlist_node *n;
+       struct hlist_node *hlist, *n;
        struct sk_buff *skb;
 
        skb = nfc_llcp_allocate_snl(local, tlvs_len);
@@ -579,7 +579,7 @@ int nfc_llcp_send_snl_sdreq(struct nfc_llcp_local *local,
                mod_timer(&local->sdreq_timer,
                          jiffies + msecs_to_jiffies(3 * local->remote_lto));
 
-       hlist_for_each_entry_safe(sdreq, n, tlv_list, node) {
+       hlist_for_each_entry_safe(sdreq, hlist, n, tlv_list, node) {
                pr_debug("tid %d for %s\n", sdreq->tid, sdreq->uri);
 
                memcpy(skb_put(skb, sdreq->tlv_len), sdreq->tlv,

diff --git a/net/nfc/llcp/llcp.c b/net/nfc/llcp/llcp.c
index e5dbec1..fd8e351 100644 (file)
--- a/net/nfc/llcp/llcp.c
+++ b/net/nfc/llcp/llcp.c
@@ -136,7 +136,7 @@ static void nfc_llcp_socket_release(struct nfc_llcp_local *local, bool device,
 
        write_lock(&local->raw_sockets.lock);
 
-       sk_for_each_safe(sk, tmp, &local->raw_sockets.head) {
+       sk_for_each_safe(sk, node, tmp, &local->raw_sockets.head) {
                llcp_sock = nfc_llcp_sock(sk);
 
                bh_lock_sock(sk);
@@ -257,7 +257,7 @@ static void nfc_llcp_sdreq_timeout_work(struct work_struct *work)
 {
        unsigned long time;
        HLIST_HEAD(nl_sdres_list);
-       struct hlist_node *n;
+       struct hlist_node *hlist, *n;
        struct nfc_llcp_sdp_tlv *sdp;
        struct nfc_llcp_local *local = container_of(work, struct nfc_llcp_local,
                                                    sdreq_timeout_work);
@@ -266,7 +266,7 @@ static void nfc_llcp_sdreq_timeout_work(struct work_struct *work)
 
        time = jiffies - msecs_to_jiffies(3 * local->remote_lto);
 
-       hlist_for_each_entry_safe(sdp, n, &local->pending_sdreqs, node) {
+       hlist_for_each_entry_safe(sdp, hlist, n, &local->pending_sdreqs, node) {
                if (time_after(sdp->time, time))
                        continue;
 
@@ -1226,6 +1226,7 @@ static void nfc_llcp_recv_snl(struct nfc_llcp_local *local,
        HLIST_HEAD(llc_sdres_list);
        size_t sdres_tlvs_len;
        HLIST_HEAD(nl_sdres_list);
+       struct hlist_node *hlist;
 
        dsap = nfc_llcp_dsap(skb);
        ssap = nfc_llcp_ssap(skb);
@@ -1313,7 +1314,7 @@ add_snl:
 
                        pr_debug("LLCP_TLV_SDRES: searching tid %d\n", tlv[2]);
 
-                       hlist_for_each_entry(sdp, &local->pending_sdreqs, node) {
+                       hlist_for_each_entry(sdp, hlist, &local->pending_sdreqs, node) {
                                if (sdp->tid != tlv[2])
                                        continue;
 

diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index 5b645c0..f45cbc8 100644 (file)
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -362,7 +362,7 @@ int nfc_genl_llc_send_sdres(struct nfc_dev *dev, struct hlist_head *sdres_list)
        struct sk_buff *msg;
        struct nlattr *sdp_attr, *uri_attr;
        struct nfc_llcp_sdp_tlv *sdres;
-       struct hlist_node *n;
+       struct hlist_node *hlist, *n;
        void *hdr;
        int rc = -EMSGSIZE;
        int i;
@@ -386,7 +386,7 @@ int nfc_genl_llc_send_sdres(struct nfc_dev *dev, struct hlist_head *sdres_list)
        }
 
        i = 1;
-       hlist_for_each_entry_safe(sdres, n, sdres_list, node) {
+       hlist_for_each_entry_safe(sdres, hlist, n, sdres_list, node) {
                pr_debug("uri: %s, sap: %d\n", sdres->uri, sdres->sap);
 
                uri_attr = nla_nest_start(msg, i++);
@@ -852,7 +852,7 @@ static int nfc_genl_llc_get_params(struct sk_buff *skb, struct genl_info *info)
                goto exit;
        }
 
-       rc = nfc_genl_send_params(msg, local, info->snd_portid, info->snd_seq);
+       rc = nfc_genl_send_params(msg, local, info->snd_pid, info->snd_seq);
 
 exit:
        device_unlock(&dev->dev);