summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-09-09 22:30:05 +0400
committerDavid S. Miller <davem@davemloft.net>2014-09-09 22:30:05 +0400
commit8b86f7f319330cf2c8ce13f36fa3b13828011daa (patch)
tree5fee8e3987844c1da354266b8c0ba06b08067d2f /include
parent49a601589caaf0e93194c0cc9b4ecddbe75dd2d5 (diff)
parent13323516172178ff8184855ee4bc66d46fd89619 (diff)
downloadlinux-8b86f7f319330cf2c8ce13f36fa3b13828011daa.tar.xz
Merge branch 'bridge_rtnl_link'
Jiri Pirko says: ==================== bridge: implement rtnl_link options for getting and setting bridge options So far, only sysfs is complete interface for getting and setting bridge options. This patchset follows-up on the similar bonding code and allows userspace to get/set bridge master/port options using Netlink IFLA_INFO_DATA/IFLA_INFO_SLAVE_DATA attr. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/uapi/linux/if_link.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index ff957604a721..c80f95f6ee78 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -215,6 +215,18 @@ enum in6_addr_gen_mode {
IN6_ADDR_GEN_MODE_NONE,
};
+/* Bridge section */
+
+enum {
+ IFLA_BR_UNSPEC,
+ IFLA_BR_FORWARD_DELAY,
+ IFLA_BR_HELLO_TIME,
+ IFLA_BR_MAX_AGE,
+ __IFLA_BR_MAX,
+};
+
+#define IFLA_BR_MAX (__IFLA_BR_MAX - 1)
+
enum {
BRIDGE_MODE_UNSPEC,
BRIDGE_MODE_HAIRPIN,