aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r--net/mac80211/cfg.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index ea06f92801e9..1c94a2ae22ee 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -984,7 +984,7 @@ static int ieee80211_dump_mpath(struct wiphy *wiphy, struct net_device *dev,
984 return 0; 984 return 0;
985} 985}
986 986
987static int ieee80211_get_mesh_params(struct wiphy *wiphy, 987static int ieee80211_get_mesh_config(struct wiphy *wiphy,
988 struct net_device *dev, 988 struct net_device *dev,
989 struct mesh_config *conf) 989 struct mesh_config *conf)
990{ 990{
@@ -1000,7 +1000,7 @@ static inline bool _chg_mesh_attr(enum nl80211_meshconf_params parm, u32 mask)
1000 return (mask >> (parm-1)) & 0x1; 1000 return (mask >> (parm-1)) & 0x1;
1001} 1001}
1002 1002
1003static int ieee80211_update_mesh_params(struct wiphy *wiphy, 1003static int ieee80211_update_mesh_config(struct wiphy *wiphy,
1004 struct net_device *dev, u32 mask, 1004 struct net_device *dev, u32 mask,
1005 const struct mesh_config *nconf) 1005 const struct mesh_config *nconf)
1006{ 1006{
@@ -1787,8 +1787,8 @@ struct cfg80211_ops mac80211_config_ops = {
1787 .change_mpath = ieee80211_change_mpath, 1787 .change_mpath = ieee80211_change_mpath,
1788 .get_mpath = ieee80211_get_mpath, 1788 .get_mpath = ieee80211_get_mpath,
1789 .dump_mpath = ieee80211_dump_mpath, 1789 .dump_mpath = ieee80211_dump_mpath,
1790 .update_mesh_params = ieee80211_update_mesh_params, 1790 .update_mesh_config = ieee80211_update_mesh_config,
1791 .get_mesh_params = ieee80211_get_mesh_params, 1791 .get_mesh_config = ieee80211_get_mesh_config,
1792 .join_mesh = ieee80211_join_mesh, 1792 .join_mesh = ieee80211_join_mesh,
1793 .leave_mesh = ieee80211_leave_mesh, 1793 .leave_mesh = ieee80211_leave_mesh,
1794#endif 1794#endif