chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: bridge - use USEC_PER_MSEC macros
[elogind.git]
/
src
/
network
/
networkd-manager.c
diff --git
a/src/network/networkd-manager.c
b/src/network/networkd-manager.c
index 46b803fee5d82a907e8bf2c9c85e9cfde44ee694..b0e3191a004c0ebb2b4b276940acfa70e408860d 100644
(file)
--- a/
src/network/networkd-manager.c
+++ b/
src/network/networkd-manager.c
@@
-25,6
+25,7
@@
#include "conf-parser.h"
#include "path-util.h"
#include "networkd.h"
#include "conf-parser.h"
#include "path-util.h"
#include "networkd.h"
+#include "networkd-netdev.h"
#include "network-internal.h"
#include "libudev-private.h"
#include "udev-util.h"
#include "network-internal.h"
#include "libudev-private.h"
#include "udev-util.h"
@@
-226,7
+227,7
@@
static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
Link *link = NULL;
NetDev *netdev = NULL;
uint16_t type;
Link *link = NULL;
NetDev *netdev = NULL;
uint16_t type;
- char *name;
+ c
onst c
har *name;
int r, ifindex;
assert(rtnl);
int r, ifindex;
assert(rtnl);
@@
-466,7
+467,7
@@
finish:
return r;
}
return r;
}
-int manager_address_pool_acquire(Manager *m,
unsigned
family, unsigned prefixlen, union in_addr_union *found) {
+int manager_address_pool_acquire(Manager *m,
int
family, unsigned prefixlen, union in_addr_union *found) {
AddressPool *p;
int r;
AddressPool *p;
int r;