backports: replace new portid usage

In this upstream commit a new usage of portid was introduced:
commit ac22ac466a659f1b2e02a2e2ee23fc5c42da2c95
Author: Samuel Ortiz <sameo@linux.intel.com>
Date:   Wed Jul 24 18:10:50 2013 +0200

    NFC: Add a GET_SE netlink API

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/patches/collateral-evolutions/nfc/01-netlink-portid/net_nfc_netlink.patch b/patches/collateral-evolutions/nfc/01-netlink-portid/net_nfc_netlink.patch
index 16cbf8ec6ec23cb04d6735adc3077ce4989ddd9f..f73352c1a194ed4dad9116c7164103db15dee959 100644 (file)
--- a/patches/collateral-evolutions/nfc/01-netlink-portid/net_nfc_netlink.patch
+++ b/patches/collateral-evolutions/nfc/01-netlink-portid/net_nfc_netlink.patch
@@ -54,7 +54,16 @@
  
  exit:
        device_unlock(&dev->dev);
-@@ -1315,12 +1315,12 @@ static int nfc_genl_rcv_nl_event(struct
+@@ -1253,7 +1253,7 @@ static int nfc_genl_dump_ses(struct sk_b
+       while (dev) {
+               int rc;
+ 
+-              rc = nfc_genl_send_se(skb, dev, NETLINK_CB(cb->skb).portid,
++              rc = nfc_genl_send_se(skb, dev, NETLINK_CB_PORTID(cb->skb),
+                                         cb->nlh->nlmsg_seq, cb, NLM_F_MULTI);
+               if (rc < 0)
+                       break;
+@@ -1408,12 +1408,12 @@ static int nfc_genl_rcv_nl_event(struct
        if (event != NETLINK_URELEASE || n->protocol != NETLINK_GENERIC)
                goto out;