diff options
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r-- | net/mac80211/cfg.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index bfd2534e5a4d..ac45304590d8 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
@@ -777,7 +777,7 @@ static void ieee80211_get_et_strings(struct wiphy *wiphy, | |||
777 | } | 777 | } |
778 | 778 | ||
779 | static int ieee80211_dump_station(struct wiphy *wiphy, struct net_device *dev, | 779 | static int ieee80211_dump_station(struct wiphy *wiphy, struct net_device *dev, |
780 | int idx, u8 *mac, struct station_info *sinfo) | 780 | int idx, u8 *mac, struct station_info *sinfo) |
781 | { | 781 | { |
782 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 782 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
783 | struct ieee80211_local *local = sdata->local; | 783 | struct ieee80211_local *local = sdata->local; |
@@ -807,7 +807,7 @@ static int ieee80211_dump_survey(struct wiphy *wiphy, struct net_device *dev, | |||
807 | } | 807 | } |
808 | 808 | ||
809 | static int ieee80211_get_station(struct wiphy *wiphy, struct net_device *dev, | 809 | static int ieee80211_get_station(struct wiphy *wiphy, struct net_device *dev, |
810 | u8 *mac, struct station_info *sinfo) | 810 | const u8 *mac, struct station_info *sinfo) |
811 | { | 811 | { |
812 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 812 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
813 | struct ieee80211_local *local = sdata->local; | 813 | struct ieee80211_local *local = sdata->local; |
@@ -1457,7 +1457,8 @@ static int sta_apply_parameters(struct ieee80211_local *local, | |||
1457 | } | 1457 | } |
1458 | 1458 | ||
1459 | static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev, | 1459 | static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev, |
1460 | u8 *mac, struct station_parameters *params) | 1460 | const u8 *mac, |
1461 | struct station_parameters *params) | ||
1461 | { | 1462 | { |
1462 | struct ieee80211_local *local = wiphy_priv(wiphy); | 1463 | struct ieee80211_local *local = wiphy_priv(wiphy); |
1463 | struct sta_info *sta; | 1464 | struct sta_info *sta; |
@@ -1526,7 +1527,7 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev, | |||
1526 | } | 1527 | } |
1527 | 1528 | ||
1528 | static int ieee80211_del_station(struct wiphy *wiphy, struct net_device *dev, | 1529 | static int ieee80211_del_station(struct wiphy *wiphy, struct net_device *dev, |
1529 | u8 *mac) | 1530 | const u8 *mac) |
1530 | { | 1531 | { |
1531 | struct ieee80211_sub_if_data *sdata; | 1532 | struct ieee80211_sub_if_data *sdata; |
1532 | 1533 | ||
@@ -1540,7 +1541,7 @@ static int ieee80211_del_station(struct wiphy *wiphy, struct net_device *dev, | |||
1540 | } | 1541 | } |
1541 | 1542 | ||
1542 | static int ieee80211_change_station(struct wiphy *wiphy, | 1543 | static int ieee80211_change_station(struct wiphy *wiphy, |
1543 | struct net_device *dev, u8 *mac, | 1544 | struct net_device *dev, const u8 *mac, |
1544 | struct station_parameters *params) | 1545 | struct station_parameters *params) |
1545 | { | 1546 | { |
1546 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 1547 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
@@ -1665,7 +1666,7 @@ out_err: | |||
1665 | 1666 | ||
1666 | #ifdef CONFIG_MAC80211_MESH | 1667 | #ifdef CONFIG_MAC80211_MESH |
1667 | static int ieee80211_add_mpath(struct wiphy *wiphy, struct net_device *dev, | 1668 | static int ieee80211_add_mpath(struct wiphy *wiphy, struct net_device *dev, |
1668 | u8 *dst, u8 *next_hop) | 1669 | const u8 *dst, const u8 *next_hop) |
1669 | { | 1670 | { |
1670 | struct ieee80211_sub_if_data *sdata; | 1671 | struct ieee80211_sub_if_data *sdata; |
1671 | struct mesh_path *mpath; | 1672 | struct mesh_path *mpath; |
@@ -1693,7 +1694,7 @@ static int ieee80211_add_mpath(struct wiphy *wiphy, struct net_device *dev, | |||
1693 | } | 1694 | } |
1694 | 1695 | ||
1695 | static int ieee80211_del_mpath(struct wiphy *wiphy, struct net_device *dev, | 1696 | static int ieee80211_del_mpath(struct wiphy *wiphy, struct net_device *dev, |
1696 | u8 *dst) | 1697 | const u8 *dst) |
1697 | { | 1698 | { |
1698 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 1699 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
1699 | 1700 | ||
@@ -1704,9 +1705,8 @@ static int ieee80211_del_mpath(struct wiphy *wiphy, struct net_device *dev, | |||
1704 | return 0; | 1705 | return 0; |
1705 | } | 1706 | } |
1706 | 1707 | ||
1707 | static int ieee80211_change_mpath(struct wiphy *wiphy, | 1708 | static int ieee80211_change_mpath(struct wiphy *wiphy, struct net_device *dev, |
1708 | struct net_device *dev, | 1709 | const u8 *dst, const u8 *next_hop) |
1709 | u8 *dst, u8 *next_hop) | ||
1710 | { | 1710 | { |
1711 | struct ieee80211_sub_if_data *sdata; | 1711 | struct ieee80211_sub_if_data *sdata; |
1712 | struct mesh_path *mpath; | 1712 | struct mesh_path *mpath; |
@@ -1798,8 +1798,8 @@ static int ieee80211_get_mpath(struct wiphy *wiphy, struct net_device *dev, | |||
1798 | } | 1798 | } |
1799 | 1799 | ||
1800 | static int ieee80211_dump_mpath(struct wiphy *wiphy, struct net_device *dev, | 1800 | static int ieee80211_dump_mpath(struct wiphy *wiphy, struct net_device *dev, |
1801 | int idx, u8 *dst, u8 *next_hop, | 1801 | int idx, u8 *dst, u8 *next_hop, |
1802 | struct mpath_info *pinfo) | 1802 | struct mpath_info *pinfo) |
1803 | { | 1803 | { |
1804 | struct ieee80211_sub_if_data *sdata; | 1804 | struct ieee80211_sub_if_data *sdata; |
1805 | struct mesh_path *mpath; | 1805 | struct mesh_path *mpath; |