summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorVivien Didelot <vivien.didelot@savoirfairelinux.com>2016-03-13 23:21:32 +0300
committerDavid S. Miller <davem@davemloft.net>2016-03-14 23:05:31 +0300
commit71327a4e7d997276d49db92fd3d30008389ee6d5 (patch)
treea54f0a8eeae79991661f60f3b1476a9af41c72be /include
parent1e1589ad8b5cb5b8a6781ba5850cf710ada0e919 (diff)
downloadlinux-71327a4e7d997276d49db92fd3d30008389ee6d5.tar.xz
net: dsa: rename port_*_bridge routines
Rename DSA port_join_bridge and port_leave_bridge routines to respectively port_bridge_join and port_bridge_leave in order to respect an implicit Port::Bridge namespace. Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Acked-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/dsa.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h
index 26c0a3fa009a..004e034184c1 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -296,9 +296,9 @@ struct dsa_switch_driver {
/*
* Bridge integration
*/
- int (*port_join_bridge)(struct dsa_switch *ds, int port,
+ int (*port_bridge_join)(struct dsa_switch *ds, int port,
struct net_device *bridge);
- int (*port_leave_bridge)(struct dsa_switch *ds, int port);
+ int (*port_bridge_leave)(struct dsa_switch *ds, int port);
int (*port_stp_update)(struct dsa_switch *ds, int port,
u8 state);