summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/nfc/01-netlink-portid
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-06-17 13:44:54 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2013-06-19 22:22:29 +0200
commite12bb70c04a439e8c47a98732bb8fe6dc895aef8 (patch)
treea1e2370dca675760095ea37b5fd5d71b1a76af96 /patches/collateral-evolutions/nfc/01-netlink-portid
parent6002eb1233b07cd2eaddf75b34ce80c72af9d256 (diff)
backports: refresh patches on next-20130617backports-20130617
== ckmake-report.log == 1 2.6.24 [ OK ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.79 [ OK ] 18 3.1.10 [ OK ] 19 3.10-rc1 [ OK ] 20 3.2.45 [ OK ] 21 3.3.8 [ OK ] 22 3.4.46 [ OK ] 23 3.5.7 [ OK ] 24 3.6.11 [ OK ] 25 3.7.10 [ OK ] 26 3.8.13 [ OK ] 27 3.9.3 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/nfc/01-netlink-portid')
-rw-r--r--patches/collateral-evolutions/nfc/01-netlink-portid/net_nfc_netlink.patch14
1 files changed, 7 insertions, 7 deletions
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 cee65eee..16cbf8ec 100644
--- a/patches/collateral-evolutions/nfc/01-netlink-portid/net_nfc_netlink.patch
+++ b/patches/collateral-evolutions/nfc/01-netlink-portid/net_nfc_netlink.patch
@@ -1,6 +1,6 @@
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
-@@ -68,7 +68,7 @@ static int nfc_genl_send_target(struct s
+@@ -70,7 +70,7 @@ static int nfc_genl_send_target(struct s
{
void *hdr;
@@ -9,7 +9,7 @@
&nfc_genl_family, flags, NFC_CMD_GET_TARGET);
if (!hdr)
return -EMSGSIZE;
-@@ -481,7 +481,7 @@ static int nfc_genl_dump_devices(struct
+@@ -545,7 +545,7 @@ static int nfc_genl_dump_devices(struct
while (dev) {
int rc;
@@ -18,7 +18,7 @@
cb->nlh->nlmsg_seq, cb, NLM_F_MULTI);
if (rc < 0)
break;
-@@ -600,7 +600,7 @@ static int nfc_genl_get_device(struct sk
+@@ -664,7 +664,7 @@ static int nfc_genl_get_device(struct sk
goto out_putdev;
}
@@ -27,7 +27,7 @@
NULL, 0);
if (rc < 0)
goto out_free;
-@@ -691,7 +691,7 @@ static int nfc_genl_start_poll(struct sk
+@@ -755,7 +755,7 @@ static int nfc_genl_start_poll(struct sk
rc = nfc_start_poll(dev, im_protocols, tm_protocols);
if (!rc)
@@ -36,7 +36,7 @@
mutex_unlock(&dev->genl_data.genl_data_mutex);
-@@ -725,7 +725,7 @@ static int nfc_genl_stop_poll(struct sk_
+@@ -789,7 +789,7 @@ static int nfc_genl_stop_poll(struct sk_
mutex_lock(&dev->genl_data.genl_data_mutex);
@@ -45,7 +45,7 @@
rc = -EBUSY;
goto out;
}
-@@ -851,7 +851,7 @@ static int nfc_genl_llc_get_params(struc
+@@ -915,7 +915,7 @@ static int nfc_genl_llc_get_params(struc
goto exit;
}
@@ -54,7 +54,7 @@
exit:
device_unlock(&dev->dev);
-@@ -1134,12 +1134,12 @@ static int nfc_genl_rcv_nl_event(struct
+@@ -1315,12 +1315,12 @@ static int nfc_genl_rcv_nl_event(struct
if (event != NETLINK_URELEASE || n->protocol != NETLINK_GENERIC)
goto out;