Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[deliverable/linux.git] / include / net / switchdev.h

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index cfcdac2e5d253ef431bc18709cc5e7edd0e47e6f..d2e69ee3019a06308dbf2951283d6db663d0ad78 100644 (file)
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -1,6 +1,7 @@
 /*
  * include/net/switchdev.h - Switch device API
  * Copyright (c) 2014 Jiri Pirko <jiri@resnulli.us>
+ * Copyright (c) 2014-2015 Scott Feldman <sfeldma@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,6 +14,35 @@
 #include <linux/netdevice.h>
 #include <linux/notifier.h>
 
+struct fib_info;
+
+/**
+ * struct switchdev_ops - switchdev operations
+ *
+ * @swdev_parent_id_get: Called to get an ID of the switch chip this port
+ *   is part of.  If driver implements this, it indicates that it
+ *   represents a port of a switch chip.
+ *
+ * @swdev_port_stp_update: Called to notify switch device port of bridge
+ *   port STP state change.
+ *
+ * @swdev_fib_ipv4_add: Called to add/modify IPv4 route to switch device.
+ *
+ * @swdev_fib_ipv4_del: Called to delete IPv4 route from switch device.
+ */
+struct swdev_ops {
+       int     (*swdev_parent_id_get)(struct net_device *dev,
+                                      struct netdev_phys_item_id *psid);
+       int     (*swdev_port_stp_update)(struct net_device *dev, u8 state);
+       int     (*swdev_fib_ipv4_add)(struct net_device *dev, __be32 dst,
+                                     int dst_len, struct fib_info *fi,
+                                     u8 tos, u8 type, u32 nlflags,
+                                     u32 tb_id);
+       int     (*swdev_fib_ipv4_del)(struct net_device *dev, __be32 dst,
+                                     int dst_len, struct fib_info *fi,
+                                     u8 tos, u8 type, u32 tb_id);
+};
+
 enum netdev_switch_notifier_type {
        NETDEV_SWITCH_FDB_ADD = 1,
        NETDEV_SWITCH_FDB_DEL,
@@ -51,6 +81,12 @@ int ndo_dflt_netdev_switch_port_bridge_dellink(struct net_device *dev,
                                               struct nlmsghdr *nlh, u16 flags);
 int ndo_dflt_netdev_switch_port_bridge_setlink(struct net_device *dev,
                                               struct nlmsghdr *nlh, u16 flags);
+int netdev_switch_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
+                              u8 tos, u8 type, u32 nlflags, u32 tb_id);
+int netdev_switch_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
+                              u8 tos, u8 type, u32 tb_id);
+void netdev_switch_fib_ipv4_abort(struct fib_info *fi);
+
 #else
 
 static inline int netdev_switch_parent_id_get(struct net_device *dev,
@@ -109,6 +145,25 @@ static inline int ndo_dflt_netdev_switch_port_bridge_setlink(struct net_device *
        return 0;
 }
 
+static inline int netdev_switch_fib_ipv4_add(u32 dst, int dst_len,
+                                            struct fib_info *fi,
+                                            u8 tos, u8 type,
+                                            u32 nlflags, u32 tb_id)
+{
+       return 0;
+}
+
+static inline int netdev_switch_fib_ipv4_del(u32 dst, int dst_len,
+                                            struct fib_info *fi,
+                                            u8 tos, u8 type, u32 tb_id)
+{
+       return 0;
+}
+
+static inline void netdev_switch_fib_ipv4_abort(struct fib_info *fi)
+{
+}
+
 #endif
 
 #endif /* _LINUX_SWITCHDEV_H_ */