diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-30 12:43:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-30 12:43:08 -0400 |
| commit | b07911593719828cac023bdcf6bf4da1c9ba546f (patch) | |
| tree | c4d2f66e6f2506e5b5439ffca0449e646f677b33 /net/ipv6/sit.c | |
| parent | 52a623bd6189b6ea8f06a0d7594c7604deaab24a (diff) | |
| parent | 4d8a991d460d4fa4829beaffdcba45a217ca0fa7 (diff) | |
| download | op-kernel-dev-b07911593719828cac023bdcf6bf4da1c9ba546f.zip op-kernel-dev-b07911593719828cac023bdcf6bf4da1c9ba546f.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
A set of overlapping changes in macvlan and the rocker
driver, nothing serious.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index e9958b1..ac912bb 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -305,7 +305,7 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t, * we try harder to allocate. */ kp = (cmax <= 1 || capable(CAP_NET_ADMIN)) ? - kcalloc(cmax, sizeof(*kp), GFP_KERNEL) : + kcalloc(cmax, sizeof(*kp), GFP_KERNEL | __GFP_NOWARN) : NULL; rcu_read_lock(); |
