OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'sound-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git...
[uclinux-h8/linux.git]
/
net
/
netfilter
/
nfnetlink_queue.c
diff --git
a/net/netfilter/nfnetlink_queue.c
b/net/netfilter/nfnetlink_queue.c
index
c979662
..
a16356c
100644
(file)
--- a/
net/netfilter/nfnetlink_queue.c
+++ b/
net/netfilter/nfnetlink_queue.c
@@
-401,7
+401,7
@@
nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,
outdev = entry->state.out;
outdev = entry->state.out;
- switch ((enum nfqnl_config_mode)
ACCESS
_ONCE(queue->copy_mode)) {
+ switch ((enum nfqnl_config_mode)
READ
_ONCE(queue->copy_mode)) {
case NFQNL_COPY_META:
case NFQNL_COPY_NONE:
break;
case NFQNL_COPY_META:
case NFQNL_COPY_NONE:
break;
@@
-412,7
+412,7
@@
nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,
skb_checksum_help(entskb))
return NULL;
skb_checksum_help(entskb))
return NULL;
- data_len =
ACCESS
_ONCE(queue->copy_range);
+ data_len =
READ
_ONCE(queue->copy_range);
if (data_len > entskb->len)
data_len = entskb->len;
if (data_len > entskb->len)
data_len = entskb->len;