diff options
-rw-r--r-- | net/ipv6/addrconf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 2fac4ad74867..d51a8c0b3372 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -2398,7 +2398,7 @@ static void addrconf_add_mroute(struct net_device *dev) | |||
2398 | 2398 | ||
2399 | ipv6_addr_set(&cfg.fc_dst, htonl(0xFF000000), 0, 0, 0); | 2399 | ipv6_addr_set(&cfg.fc_dst, htonl(0xFF000000), 0, 0, 0); |
2400 | 2400 | ||
2401 | ip6_route_add(&cfg, GFP_ATOMIC, NULL); | 2401 | ip6_route_add(&cfg, GFP_KERNEL, NULL); |
2402 | } | 2402 | } |
2403 | 2403 | ||
2404 | static struct inet6_dev *addrconf_add_dev(struct net_device *dev) | 2404 | static struct inet6_dev *addrconf_add_dev(struct net_device *dev) |
@@ -3062,7 +3062,7 @@ static void sit_add_v4_addrs(struct inet6_dev *idev) | |||
3062 | if (addr.s6_addr32[3]) { | 3062 | if (addr.s6_addr32[3]) { |
3063 | add_addr(idev, &addr, plen, scope); | 3063 | add_addr(idev, &addr, plen, scope); |
3064 | addrconf_prefix_route(&addr, plen, 0, idev->dev, 0, pflags, | 3064 | addrconf_prefix_route(&addr, plen, 0, idev->dev, 0, pflags, |
3065 | GFP_ATOMIC); | 3065 | GFP_KERNEL); |
3066 | return; | 3066 | return; |
3067 | } | 3067 | } |
3068 | 3068 | ||
@@ -3087,7 +3087,7 @@ static void sit_add_v4_addrs(struct inet6_dev *idev) | |||
3087 | 3087 | ||
3088 | add_addr(idev, &addr, plen, flag); | 3088 | add_addr(idev, &addr, plen, flag); |
3089 | addrconf_prefix_route(&addr, plen, 0, idev->dev, | 3089 | addrconf_prefix_route(&addr, plen, 0, idev->dev, |
3090 | 0, pflags, GFP_ATOMIC); | 3090 | 0, pflags, GFP_KERNEL); |
3091 | } | 3091 | } |
3092 | } | 3092 | } |
3093 | } | 3093 | } |