projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove rps/xps configuration support
[project/netifd.git]
/
device.h
diff --git
a/device.h
b/device.h
index
3c172ce
..
dc45967
100644
(file)
--- a/
device.h
+++ b/
device.h
@@
-40,8
+40,6
@@
enum {
DEV_ATTR_IGMPVERSION,
DEV_ATTR_MLDVERSION,
DEV_ATTR_NEIGHREACHABLETIME,
DEV_ATTR_IGMPVERSION,
DEV_ATTR_MLDVERSION,
DEV_ATTR_NEIGHREACHABLETIME,
- DEV_ATTR_RPS,
- DEV_ATTR_XPS,
DEV_ATTR_DADTRANSMITS,
DEV_ATTR_MULTICAST_TO_UNICAST,
DEV_ATTR_MULTICAST_ROUTER,
DEV_ATTR_DADTRANSMITS,
DEV_ATTR_MULTICAST_TO_UNICAST,
DEV_ATTR_MULTICAST_ROUTER,
@@
-51,6
+49,7
@@
enum {
DEV_ATTR_UNICAST_FLOOD,
DEV_ATTR_NEIGHGCSTALETIME,
DEV_ATTR_SENDREDIRECTS,
DEV_ATTR_UNICAST_FLOOD,
DEV_ATTR_NEIGHGCSTALETIME,
DEV_ATTR_SENDREDIRECTS,
+ DEV_ATTR_NEIGHLOCKTIME,
__DEV_ATTR_MAX,
};
__DEV_ATTR_MAX,
};
@@
-91,8
+90,7
@@
enum {
DEV_OPT_IGMPVERSION = (1 << 7),
DEV_OPT_MLDVERSION = (1 << 8),
DEV_OPT_NEIGHREACHABLETIME = (1 << 9),
DEV_OPT_IGMPVERSION = (1 << 7),
DEV_OPT_MLDVERSION = (1 << 8),
DEV_OPT_NEIGHREACHABLETIME = (1 << 9),
- DEV_OPT_RPS = (1 << 10),
- DEV_OPT_XPS = (1 << 11),
+ /* 2 bit hole */
DEV_OPT_MTU6 = (1 << 12),
DEV_OPT_DADTRANSMITS = (1 << 13),
DEV_OPT_MULTICAST_TO_UNICAST = (1 << 14),
DEV_OPT_MTU6 = (1 << 12),
DEV_OPT_DADTRANSMITS = (1 << 13),
DEV_OPT_MULTICAST_TO_UNICAST = (1 << 14),
@@
-102,7
+100,8
@@
enum {
DEV_OPT_UNICAST_FLOOD = (1 << 18),
DEV_OPT_NEIGHGCSTALETIME = (1 << 19),
DEV_OPT_MULTICAST_FAST_LEAVE = (1 << 20),
DEV_OPT_UNICAST_FLOOD = (1 << 18),
DEV_OPT_NEIGHGCSTALETIME = (1 << 19),
DEV_OPT_MULTICAST_FAST_LEAVE = (1 << 20),
- DEV_OPT_SENDREDIRECTS = (1 << 17),
+ DEV_OPT_SENDREDIRECTS = (1 << 21),
+ DEV_OPT_NEIGHLOCKTIME = (1 << 22),
};
/* events broadcasted to all users of a device */
};
/* events broadcasted to all users of a device */
@@
-160,8
+159,7
@@
struct device_settings {
unsigned int neigh6reachabletime;
unsigned int neigh4gcstaletime;
unsigned int neigh6gcstaletime;
unsigned int neigh6reachabletime;
unsigned int neigh4gcstaletime;
unsigned int neigh6gcstaletime;
- bool rps;
- bool xps;
+ int neigh4locktime;
unsigned int dadtransmits;
bool multicast_to_unicast;
unsigned int multicast_router;
unsigned int dadtransmits;
bool multicast_to_unicast;
unsigned int multicast_router;
@@
-238,6
+236,7
@@
int device_type_add(struct device_type *devtype);
struct device_type *device_type_get(const char *tname);
struct device *device_create(const char *name, struct device_type *type,
struct blob_attr *config);
struct device_type *device_type_get(const char *tname);
struct device *device_create(const char *name, struct device_type *type,
struct blob_attr *config);
+void device_merge_settings(struct device *dev, struct device_settings *n);
void device_init_settings(struct device *dev, struct blob_attr **tb);
void device_init_pending(void);
void device_init_settings(struct device *dev, struct blob_attr **tb);
void device_init_pending(void);
@@
-247,14
+246,13
@@
device_apply_config(struct device *dev, struct device_type *type,
void device_reset_config(void);
void device_reset_old(void);
void device_reset_config(void);
void device_reset_old(void);
-void device_set_default_ps(bool state);
void device_init_virtual(struct device *dev, struct device_type *type, const char *name);
void device_init_virtual(struct device *dev, struct device_type *type, const char *name);
-int device_init(struct device *
iface
, struct device_type *type, const char *ifname);
+int device_init(struct device *
dev
, struct device_type *type, const char *ifname);
void device_cleanup(struct device *dev);
struct device *device_find(const char *name);
struct device *device_get(const char *name, int create);
void device_cleanup(struct device *dev);
struct device *device_find(const char *name);
struct device *device_get(const char *name, int create);
-void device_add_user(struct device_user *dep, struct device *
iface
);
+void device_add_user(struct device_user *dep, struct device *
dev
);
void device_remove_user(struct device_user *dep);
void device_broadcast_event(struct device *dev, enum device_event ev);
void device_remove_user(struct device_user *dep);
void device_broadcast_event(struct device *dev, enum device_event ev);