projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
device: preserve orig_settings flags for querying device status
[project/netifd.git]
/
device.c
diff --git
a/device.c
b/device.c
index
21b436f
..
67e9d9a
100644
(file)
--- a/
device.c
+++ b/
device.c
@@
-74,15
+74,14
@@
void device_unlock(void)
static int set_device_state(struct device *dev, bool state)
{
if (state) {
static int set_device_state(struct device *dev, bool state)
{
if (state) {
- /*
S
et ifindex for all devices being enabled so a valid */
+ /*
G
et ifindex for all devices being enabled so a valid */
/* ifindex is in place avoiding possible race conditions */
device_set_ifindex(dev, system_if_resolve(dev));
if (!dev->ifindex)
return -1;
/* ifindex is in place avoiding possible race conditions */
device_set_ifindex(dev, system_if_resolve(dev));
if (!dev->ifindex)
return -1;
- }
- if (state)
system_if_up(dev);
system_if_up(dev);
+ }
else
system_if_down(dev);
else
system_if_down(dev);
@@
-175,7
+174,7
@@
device_merge_settings(struct device *dev, struct device_settings *n)
s->dadtransmits : os->dadtransmits;
n->multicast_to_unicast = s->multicast_to_unicast;
n->multicast_router = s->multicast_router;
s->dadtransmits : os->dadtransmits;
n->multicast_to_unicast = s->multicast_to_unicast;
n->multicast_router = s->multicast_router;
- n->flags = s->flags | os->flags;
+ n->flags = s->flags | os->flags
| os->valid_flags
;
}
void
}
void
@@
-332,7
+331,13
@@
int device_claim(struct device_user *dep)
return 0;
device_broadcast_event(dev, DEV_EVENT_SETUP);
return 0;
device_broadcast_event(dev, DEV_EVENT_SETUP);
- if (!dev->external)
+ if (dev->external) {
+ /* Get ifindex for external claimed devices so a valid */
+ /* ifindex is in place avoiding possible race conditions */
+ device_set_ifindex(dev, system_if_resolve(dev));
+ if (!dev->ifindex)
+ ret = -1;
+ } else
ret = dev->set_state(dev, true);
if (ret == 0)
ret = dev->set_state(dev, true);
if (ret == 0)