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

Commit 34a488c1 authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman
Browse files

Staging: Update parameters for cfg80211 key management operation 



Commit e31b8213 ("cfg80211/mac80211:
allow per-station GTKs") changed the signatures of these operations
but did not update the staging drivers.

Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5f2e8773

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

+6 −6
Original line number Diff line number Diff line
@@ -95,12 +95,12 @@ static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy, 
					    struct net_device *dev,

					    u8 key_idx);

static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,

				 u8 key_idx, const u8 *mac_addr,

				 u8 key_idx, bool pairwise, const u8 *mac_addr,

				 struct key_params *params);

static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,

				 u8 key_idx, const u8 *mac_addr);

				 u8 key_idx, bool pairwise, const u8 *mac_addr);

static s32 wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,

				 u8 key_idx, const u8 *mac_addr,

				 u8 key_idx, bool pairwise, const u8 *mac_addr,

				 void *cookie, void (*callback) (void *cookie,

								 struct

								 key_params *
@@ -1615,7 +1615,7 @@ wl_add_keyext(struct wiphy *wiphy, struct net_device *dev, 


static s32

wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,

		    u8 key_idx, const u8 *mac_addr,

		    u8 key_idx, bool pairwise, const u8 *mac_addr,

		    struct key_params *params)

{

	struct wl_wsec_key key;
@@ -1700,7 +1700,7 @@ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, 


static s32

wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,

		    u8 key_idx, const u8 *mac_addr)

		    u8 key_idx, bool pairwise, const u8 *mac_addr)

{

	struct wl_wsec_key key;

	s32 err = 0;
@@ -1756,7 +1756,7 @@ wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, 


static s32

wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,

		    u8 key_idx, const u8 *mac_addr, void *cookie,

		    u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie,

		    void (*callback) (void *cookie, struct key_params * params))

{

	struct key_params params;

drivers/staging/wlan-ng/cfg80211.c

+3 −3
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ exit: 
}



int prism2_add_key(struct wiphy *wiphy, struct net_device *dev,

		   u8 key_index, const u8 *mac_addr,

		   u8 key_index, bool pairwise, const u8 *mac_addr,

		   struct key_params *params)

{

	wlandevice_t *wlandev = dev->ml_priv;
@@ -198,7 +198,7 @@ exit: 
}



int prism2_get_key(struct wiphy *wiphy, struct net_device *dev,

		   u8 key_index, const u8 *mac_addr, void *cookie,

		   u8 key_index, bool pairwise, const u8 *mac_addr, void *cookie,

		   void (*callback)(void *cookie, struct key_params*))

{

	wlandevice_t *wlandev = dev->ml_priv;
@@ -227,7 +227,7 @@ int prism2_get_key(struct wiphy *wiphy, struct net_device *dev, 
}



int prism2_del_key(struct wiphy *wiphy, struct net_device *dev,

		   u8 key_index, const u8 *mac_addr)

		   u8 key_index, bool pairwise, const u8 *mac_addr)

{

	wlandevice_t *wlandev = dev->ml_priv;

	u32 did;