From fbf296c61e167426071e5d338f7b4b5a8a0dc545 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Thu, 5 May 2005 14:30:15 -0700 Subject: [PATCH] --- yaml --- r: 955 b: refs/heads/master c: 60d530655334369b62f260296a5ed1646a9529f0 h: refs/heads/master i: 953: 0f6475aeab086e408f038deebcbc8921821f77fd 951: 562d45d8e969780712d1fd9a6e477f99787e9493 v: v3 --- [refs] | 2 +- trunk/net/ipv4/multipath_wrandom.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0ff4632cc8c8..04c6600ebb73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ef4e9a8db6c65de7c7f4bc013d62b0d73f50dce +refs/heads/master: 60d530655334369b62f260296a5ed1646a9529f0 diff --git a/trunk/net/ipv4/multipath_wrandom.c b/trunk/net/ipv4/multipath_wrandom.c index 10b23e1bece6..c3d2ca1a6781 100644 --- a/trunk/net/ipv4/multipath_wrandom.c +++ b/trunk/net/ipv4/multipath_wrandom.c @@ -172,7 +172,7 @@ static void wrandom_select_route(const struct flowi *flp, multipath_comparekeys(&rt->fl, flp)) { struct multipath_candidate* mpc = (struct multipath_candidate*) - kmalloc(size_mpc, GFP_KERNEL); + kmalloc(size_mpc, GFP_ATOMIC); if (!mpc) return; @@ -244,7 +244,7 @@ static void wrandom_set_nhinfo(__u32 network, if (!target_route) { const size_t size_rt = sizeof(struct multipath_route); target_route = (struct multipath_route *) - kmalloc(size_rt, GFP_KERNEL); + kmalloc(size_rt, GFP_ATOMIC); target_route->gw = nh->nh_gw; target_route->oif = nh->nh_oif; @@ -265,7 +265,7 @@ static void wrandom_set_nhinfo(__u32 network, if (!target_dest) { const size_t size_dst = sizeof(struct multipath_dest); target_dest = (struct multipath_dest*) - kmalloc(size_dst, GFP_KERNEL); + kmalloc(size_dst, GFP_ATOMIC); target_dest->nh_info = nh; target_dest->network = network;