diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2010-11-07 12:22:41 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-09 19:49:33 -0500 |
commit | 34a488c1e0eabcea65e846d934fa51860fe66248 (patch) | |
tree | 20c18033bb8526a31517255ebae919c63ca23df6 | |
parent | 5f2e87738627d6c0faa50d9f401da0b1571e439c (diff) |
Staging: Update parameters for cfg80211 key management operation
Commit e31b82136d1adc7a599b6e99d3321e5831841f5a ("cfg80211/mac80211:
allow per-station GTKs") changed the signatures of these operations
but did not update the staging drivers.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 12 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/cfg80211.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c index 3f29488d9c7..ea0825238d5 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | |||
@@ -95,12 +95,12 @@ static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy, | |||
95 | struct net_device *dev, | 95 | struct net_device *dev, |
96 | u8 key_idx); | 96 | u8 key_idx); |
97 | static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, | 97 | static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, |
98 | u8 key_idx, const u8 *mac_addr, | 98 | u8 key_idx, bool pairwise, const u8 *mac_addr, |
99 | struct key_params *params); | 99 | struct key_params *params); |
100 | static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, | 100 | static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, |
101 | u8 key_idx, const u8 *mac_addr); | 101 | u8 key_idx, bool pairwise, const u8 *mac_addr); |
102 | static s32 wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, | 102 | static s32 wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, |
103 | u8 key_idx, const u8 *mac_addr, | 103 | u8 key_idx, bool pairwise, const u8 *mac_addr, |
104 | void *cookie, void (*callback) (void *cookie, | 104 | void *cookie, void (*callback) (void *cookie, |
105 | struct | 105 | struct |
106 | key_params * | 106 | key_params * |
@@ -1615,7 +1615,7 @@ wl_add_keyext(struct wiphy *wiphy, struct net_device *dev, | |||
1615 | 1615 | ||
1616 | static s32 | 1616 | static s32 |
1617 | wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, | 1617 | wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, |
1618 | u8 key_idx, const u8 *mac_addr, | 1618 | u8 key_idx, bool pairwise, const u8 *mac_addr, |
1619 | struct key_params *params) | 1619 | struct key_params *params) |
1620 | { | 1620 | { |
1621 | struct wl_wsec_key key; | 1621 | struct wl_wsec_key key; |
@@ -1700,7 +1700,7 @@ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, | |||
1700 | 1700 | ||
1701 | static s32 | 1701 | static s32 |
1702 | wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, | 1702 | wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, |
1703 | u8 key_idx, const u8 *mac_addr) | 1703 | u8 key_idx, bool pairwise, const u8 *mac_addr) |
1704 | { | 1704 | { |
1705 | struct wl_wsec_key key; | 1705 | struct wl_wsec_key key; |
1706 | s32 err = 0; | 1706 | s32 err = 0; |
@@ -1756,7 +1756,7 @@ wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, | |||
1756 | 1756 | ||
1757 | static s32 | 1757 | static s32 |
1758 | wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, | 1758 | wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, |
1759 | u8 key_idx, const u8 *mac_addr, void *cookie, | 1759 | u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie, |
1760 | void (*callback) (void *cookie, struct key_params * params)) | 1760 | void (*callback) (void *cookie, struct key_params * params)) |
1761 | { | 1761 | { |
1762 | struct key_params params; | 1762 | struct key_params params; |
diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c index 4af83d5318f..6a71f52c59b 100644 --- a/drivers/staging/wlan-ng/cfg80211.c +++ b/drivers/staging/wlan-ng/cfg80211.c | |||
@@ -139,7 +139,7 @@ exit: | |||
139 | } | 139 | } |
140 | 140 | ||
141 | int prism2_add_key(struct wiphy *wiphy, struct net_device *dev, | 141 | int prism2_add_key(struct wiphy *wiphy, struct net_device *dev, |
142 | u8 key_index, const u8 *mac_addr, | 142 | u8 key_index, bool pairwise, const u8 *mac_addr, |
143 | struct key_params *params) | 143 | struct key_params *params) |
144 | { | 144 | { |
145 | wlandevice_t *wlandev = dev->ml_priv; | 145 | wlandevice_t *wlandev = dev->ml_priv; |
@@ -198,7 +198,7 @@ exit: | |||
198 | } | 198 | } |
199 | 199 | ||
200 | int prism2_get_key(struct wiphy *wiphy, struct net_device *dev, | 200 | int prism2_get_key(struct wiphy *wiphy, struct net_device *dev, |
201 | u8 key_index, const u8 *mac_addr, void *cookie, | 201 | u8 key_index, bool pairwise, const u8 *mac_addr, void *cookie, |
202 | void (*callback)(void *cookie, struct key_params*)) | 202 | void (*callback)(void *cookie, struct key_params*)) |
203 | { | 203 | { |
204 | wlandevice_t *wlandev = dev->ml_priv; | 204 | wlandevice_t *wlandev = dev->ml_priv; |
@@ -227,7 +227,7 @@ int prism2_get_key(struct wiphy *wiphy, struct net_device *dev, | |||
227 | } | 227 | } |
228 | 228 | ||
229 | int prism2_del_key(struct wiphy *wiphy, struct net_device *dev, | 229 | int prism2_del_key(struct wiphy *wiphy, struct net_device *dev, |
230 | u8 key_index, const u8 *mac_addr) | 230 | u8 key_index, bool pairwise, const u8 *mac_addr) |
231 | { | 231 | { |
232 | wlandevice_t *wlandev = dev->ml_priv; | 232 | wlandevice_t *wlandev = dev->ml_priv; |
233 | u32 did; | 233 | u32 did; |