summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorRob Herring2015-03-10 09:03:04 -0500
committerRob Herring2015-03-10 09:03:04 -0500
commit2c192699a7050ef5bdf1e2cc95fdddfbcf524509 (patch)
tree945d4553691ecb24151a2fa83b7d489665dd3248 /include/net
parent25e8f336e535d10c30216e1ba330fbea98dfccc5 (diff)
parent9eccca0843205f87c00404b663188b88eb248051 (diff)
Merge tag 'v4.0-rc3' into HEAD
Linux 4.0-rc3 Merging in v4.0-rc3 because commit 30a22c215a00 (console: Fix console name size mismatch) is a dependency.
Diffstat (limited to 'include/net')
-rw-r--r--include/net/caif/cfpkt.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/caif/cfpkt.h b/include/net/caif/cfpkt.h
index 1c1ad46250d5..fe328c52c46b 100644
--- a/include/net/caif/cfpkt.h
+++ b/include/net/caif/cfpkt.h
@@ -171,7 +171,7 @@ struct cfpkt *cfpkt_split(struct cfpkt *pkt, u16 pos);
* @return Checksum of buffer.
*/
-u16 cfpkt_iterate(struct cfpkt *pkt,
+int cfpkt_iterate(struct cfpkt *pkt,
u16 (*iter_func)(u16 chks, void *buf, u16 len),
u16 data);