diff options
Diffstat (limited to 'net/ipv4/fib_semantics.c')
| -rw-r--r-- | net/ipv4/fib_semantics.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index d41219e8037c..186f20c4a45e 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c | |||
| @@ -1087,7 +1087,7 @@ fib_convert_rtentry(int cmd, struct nlmsghdr *nl, struct rtmsg *rtm, | |||
| 1087 | rta->rta_oif = &dev->ifindex; | 1087 | rta->rta_oif = &dev->ifindex; |
| 1088 | if (colon) { | 1088 | if (colon) { |
| 1089 | struct in_ifaddr *ifa; | 1089 | struct in_ifaddr *ifa; |
| 1090 | struct in_device *in_dev = __in_dev_get(dev); | 1090 | struct in_device *in_dev = __in_dev_get_rtnl(dev); |
| 1091 | if (!in_dev) | 1091 | if (!in_dev) |
| 1092 | return -ENODEV; | 1092 | return -ENODEV; |
| 1093 | *colon = ':'; | 1093 | *colon = ':'; |
| @@ -1268,7 +1268,7 @@ int fib_sync_up(struct net_device *dev) | |||
| 1268 | } | 1268 | } |
| 1269 | if (nh->nh_dev == NULL || !(nh->nh_dev->flags&IFF_UP)) | 1269 | if (nh->nh_dev == NULL || !(nh->nh_dev->flags&IFF_UP)) |
| 1270 | continue; | 1270 | continue; |
| 1271 | if (nh->nh_dev != dev || __in_dev_get(dev) == NULL) | 1271 | if (nh->nh_dev != dev || !__in_dev_get_rtnl(dev)) |
| 1272 | continue; | 1272 | continue; |
| 1273 | alive++; | 1273 | alive++; |
| 1274 | spin_lock_bh(&fib_multipath_lock); | 1274 | spin_lock_bh(&fib_multipath_lock); |
