aboutsummaryrefslogtreecommitdiff
path: root/net/can/af_can.h
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2017-02-24 12:03:21 +0800
committerAlex Shi <alex.shi@linaro.org>2017-02-24 12:03:21 +0800
commitba0cfa06c512552bdba8264b46b006478253f39b (patch)
tree803ecd2eddc27a45fe41691a2ac058f59051fe9d /net/can/af_can.h
parent26c815656d14b133b04936f384f5a55fceb2e835 (diff)
parentaedb4a24b9ae4fbd6ced45ae64ae3d84b423f5c2 (diff)
downloadlinux-linaro-stable-ba0cfa06c512552bdba8264b46b006478253f39b.tar.gz
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'net/can/af_can.h')
-rw-r--r--net/can/af_can.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/can/af_can.h b/net/can/af_can.h
index fca0fe9fc45a..b86f5129e838 100644
--- a/net/can/af_can.h
+++ b/net/can/af_can.h
@@ -50,13 +50,14 @@
struct receiver {
struct hlist_node list;
- struct rcu_head rcu;
canid_t can_id;
canid_t mask;
unsigned long matches;
void (*func)(struct sk_buff *, void *);
void *data;
char *ident;
+ struct sock *sk;
+ struct rcu_head rcu;
};
#define CAN_SFF_RCV_ARRAY_SZ (1 << CAN_SFF_ID_BITS)