diff options
author | Jakub Kicinski <kuba@kernel.org> | 2022-10-21 02:49:10 +0200 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2022-10-21 02:49:10 +0200 |
commit | 94adb5e29e0e583283183dbaa852ee9d7d0c4c26 (patch) | |
tree | 3038a63f3ed9632711100f1187c4c53c304b785b /net/openvswitch | |
parent | net: ipa: Proactively round up to kmalloc bucket size (diff) | |
parent | Merge tag 'net-6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
download | linux-94adb5e29e0e583283183dbaa852ee9d7d0c4c26.tar.xz linux-94adb5e29e0e583283183dbaa852ee9d7d0c4c26.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/openvswitch')
-rw-r--r-- | net/openvswitch/actions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index 868db4669a29..ca3ebfdb3023 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c @@ -1033,7 +1033,7 @@ static int sample(struct datapath *dp, struct sk_buff *skb, actions = nla_next(sample_arg, &rem); if ((arg->probability != U32_MAX) && - (!arg->probability || prandom_u32() > arg->probability)) { + (!arg->probability || get_random_u32() > arg->probability)) { if (last) consume_skb(skb); return 0; |