diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-10-23 13:54:49 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-09 16:33:27 -0500 |
commit | 22b4dc5917a2644001e449b238ac18fb182b27fc (patch) | |
tree | ef400c024e9cce7d2aa138d8d71b012117ae9b2d | |
parent | 32a0fdf27c7d3742c179d84c512fb9a3432e235f (diff) |
Staging: ath6kl: Adapt API changes in cfg80211
The cfg80211 API changed in commit e31b82136d1adc7a599b6e99d3321e5831841f5a
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/ath6kl/os/linux/cfg80211.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/ath6kl/os/linux/cfg80211.c b/drivers/staging/ath6kl/os/linux/cfg80211.c index c94ad29eeb4d..7269d0a1d618 100644 --- a/drivers/staging/ath6kl/os/linux/cfg80211.c +++ b/drivers/staging/ath6kl/os/linux/cfg80211.c | |||
@@ -808,7 +808,7 @@ ar6k_cfg80211_scanComplete_event(AR_SOFTC_T *ar, A_STATUS status) | |||
808 | 808 | ||
809 | static int | 809 | static int |
810 | ar6k_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, | 810 | ar6k_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, |
811 | A_UINT8 key_index, const A_UINT8 *mac_addr, | 811 | A_UINT8 key_index, bool pairwise, const A_UINT8 *mac_addr, |
812 | struct key_params *params) | 812 | struct key_params *params) |
813 | { | 813 | { |
814 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev); | 814 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev); |
@@ -901,7 +901,7 @@ ar6k_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, | |||
901 | 901 | ||
902 | static int | 902 | static int |
903 | ar6k_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev, | 903 | ar6k_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev, |
904 | A_UINT8 key_index, const A_UINT8 *mac_addr) | 904 | A_UINT8 key_index, bool pairwise, const A_UINT8 *mac_addr) |
905 | { | 905 | { |
906 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev); | 906 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev); |
907 | 907 | ||
@@ -936,7 +936,8 @@ ar6k_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev, | |||
936 | 936 | ||
937 | static int | 937 | static int |
938 | ar6k_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev, | 938 | ar6k_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev, |
939 | A_UINT8 key_index, const A_UINT8 *mac_addr, void *cookie, | 939 | A_UINT8 key_index, bool pairwise, const A_UINT8 *mac_addr, |
940 | void *cookie, | ||
940 | void (*callback)(void *cookie, struct key_params*)) | 941 | void (*callback)(void *cookie, struct key_params*)) |
941 | { | 942 | { |
942 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev); | 943 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev); |