Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40a10fd7 authored by John W. Linville's avatar John W. Linville
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

parents 99abe65f 67af9811

drivers/net/wireless/ath/ath6kl/cfg80211.c

+4 −3
Original line number Diff line number Diff line
@@ -1759,7 +1759,7 @@ static bool is_rate_ht40(s32 rate, u8 *mcs, bool *sgi) 
}



static int ath6kl_get_station(struct wiphy *wiphy, struct net_device *dev,

			      u8 *mac, struct station_info *sinfo)

			      const u8 *mac, struct station_info *sinfo)

{

	struct ath6kl *ar = ath6kl_priv(dev);

	struct ath6kl_vif *vif = netdev_priv(dev);
@@ -2974,7 +2974,7 @@ static int ath6kl_stop_ap(struct wiphy *wiphy, struct net_device *dev) 
static const u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };



static int ath6kl_del_station(struct wiphy *wiphy, struct net_device *dev,

			      u8 *mac)

			      const u8 *mac)

{

	struct ath6kl *ar = ath6kl_priv(dev);

	struct ath6kl_vif *vif = netdev_priv(dev);
@@ -2985,7 +2985,8 @@ static int ath6kl_del_station(struct wiphy *wiphy, struct net_device *dev, 
}



static int ath6kl_change_station(struct wiphy *wiphy, struct net_device *dev,

				 u8 *mac, struct station_parameters *params)

				 const u8 *mac,

				 struct station_parameters *params)

{

	struct ath6kl *ar = ath6kl_priv(dev);

	struct ath6kl_vif *vif = netdev_priv(dev);

drivers/net/wireless/ath/ath6kl/wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -2320,7 +2320,7 @@ int ath6kl_wmi_addkey_cmd(struct wmi *wmi, u8 if_idx, u8 key_index, 
	return ret;

}



int ath6kl_wmi_add_krk_cmd(struct wmi *wmi, u8 if_idx, u8 *krk)

int ath6kl_wmi_add_krk_cmd(struct wmi *wmi, u8 if_idx, const u8 *krk)

{

	struct sk_buff *skb;

	struct wmi_add_krk_cmd *cmd;

drivers/net/wireless/ath/ath6kl/wmi.h

+1 −1
Original line number Diff line number Diff line
@@ -2616,7 +2616,7 @@ int ath6kl_wmi_addkey_cmd(struct wmi *wmi, u8 if_idx, u8 key_index, 
			  u8 *key_material,

			  u8 key_op_ctrl, u8 *mac_addr,

			  enum wmi_sync_flag sync_flag);

int ath6kl_wmi_add_krk_cmd(struct wmi *wmi, u8 if_idx, u8 *krk);

int ath6kl_wmi_add_krk_cmd(struct wmi *wmi, u8 if_idx, const u8 *krk);

int ath6kl_wmi_deletekey_cmd(struct wmi *wmi, u8 if_idx, u8 key_index);

int ath6kl_wmi_setpmkid_cmd(struct wmi *wmi, u8 if_idx, const u8 *bssid,

			    const u8 *pmkid, bool set);

drivers/net/wireless/ath/wil6210/cfg80211.c

+2 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int wil_cid_fill_sinfo(struct wil6210_priv *wil, int cid, 


static int wil_cfg80211_get_station(struct wiphy *wiphy,

				    struct net_device *ndev,

				    u8 *mac, struct station_info *sinfo)

				    const u8 *mac, struct station_info *sinfo)

{

	struct wil6210_priv *wil = wiphy_to_wil(wiphy);

	int rc;
@@ -671,7 +671,7 @@ static int wil_cfg80211_stop_ap(struct wiphy *wiphy, 
}



static int wil_cfg80211_del_station(struct wiphy *wiphy,

				    struct net_device *dev, u8 *mac)

				    struct net_device *dev, const u8 *mac)

{

	struct wil6210_priv *wil = wiphy_to_wil(wiphy);

drivers/net/wireless/ath/wil6210/main.c

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void wil_disconnect_cid(struct wil6210_priv *wil, int cid) 
	memset(&sta->stats, 0, sizeof(sta->stats));

}



static void _wil6210_disconnect(struct wil6210_priv *wil, void *bssid)

static void _wil6210_disconnect(struct wil6210_priv *wil, const u8 *bssid)

{

	int cid = -ENOENT;

	struct net_device *ndev = wil_to_ndev(wil);
@@ -252,7 +252,7 @@ int wil_priv_init(struct wil6210_priv *wil) 
	return 0;

}



void wil6210_disconnect(struct wil6210_priv *wil, void *bssid)

void wil6210_disconnect(struct wil6210_priv *wil, const u8 *bssid)

{

	del_timer_sync(&wil->connect_timer);

	_wil6210_disconnect(wil, bssid);