diff options
author | Patrick McHardy <kaber@trash.net> | 2005-05-05 17:30:15 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-05-05 17:30:15 -0400 |
commit | 60d530655334369b62f260296a5ed1646a9529f0 (patch) | |
tree | 3b34a13404a41589df322a64bc2d9b7861f43a9d /net/ipv4/multipath_wrandom.c | |
parent | 3ef4e9a8db6c65de7c7f4bc013d62b0d73f50dce (diff) |
[IPV4]: multipath_wrandom.c GPF fixes
multipath_wrandom needs to use GFP_ATOMIC.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/multipath_wrandom.c')
-rw-r--r-- | net/ipv4/multipath_wrandom.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/multipath_wrandom.c b/net/ipv4/multipath_wrandom.c index 10b23e1bece6..c3d2ca1a6781 100644 --- a/net/ipv4/multipath_wrandom.c +++ b/net/ipv4/multipath_wrandom.c | |||
@@ -172,7 +172,7 @@ static void wrandom_select_route(const struct flowi *flp, | |||
172 | multipath_comparekeys(&rt->fl, flp)) { | 172 | multipath_comparekeys(&rt->fl, flp)) { |
173 | struct multipath_candidate* mpc = | 173 | struct multipath_candidate* mpc = |
174 | (struct multipath_candidate*) | 174 | (struct multipath_candidate*) |
175 | kmalloc(size_mpc, GFP_KERNEL); | 175 | kmalloc(size_mpc, GFP_ATOMIC); |
176 | 176 | ||
177 | if (!mpc) | 177 | if (!mpc) |
178 | return; | 178 | return; |
@@ -244,7 +244,7 @@ static void wrandom_set_nhinfo(__u32 network, | |||
244 | if (!target_route) { | 244 | if (!target_route) { |
245 | const size_t size_rt = sizeof(struct multipath_route); | 245 | const size_t size_rt = sizeof(struct multipath_route); |
246 | target_route = (struct multipath_route *) | 246 | target_route = (struct multipath_route *) |
247 | kmalloc(size_rt, GFP_KERNEL); | 247 | kmalloc(size_rt, GFP_ATOMIC); |
248 | 248 | ||
249 | target_route->gw = nh->nh_gw; | 249 | target_route->gw = nh->nh_gw; |
250 | target_route->oif = nh->nh_oif; | 250 | target_route->oif = nh->nh_oif; |
@@ -265,7 +265,7 @@ static void wrandom_set_nhinfo(__u32 network, | |||
265 | if (!target_dest) { | 265 | if (!target_dest) { |
266 | const size_t size_dst = sizeof(struct multipath_dest); | 266 | const size_t size_dst = sizeof(struct multipath_dest); |
267 | target_dest = (struct multipath_dest*) | 267 | target_dest = (struct multipath_dest*) |
268 | kmalloc(size_dst, GFP_KERNEL); | 268 | kmalloc(size_dst, GFP_ATOMIC); |
269 | 269 | ||
270 | target_dest->nh_info = nh; | 270 | target_dest->nh_info = nh; |
271 | target_dest->network = network; | 271 | target_dest->network = network; |