diff options
author | Joe Perches <joe@perches.com> | 2011-01-27 23:04:18 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-31 16:49:55 -0500 |
commit | a789325dc3aa89bb5001d26b542d7abc775b46f1 (patch) | |
tree | e77242cd73c7332ae132f30216ef328659d056bf | |
parent | d7ddd16933ca9f7957b6caed5b323f7f167faa60 (diff) |
staging: ath6kl: Update cfg80211 to recent calling convention changes
Add bool unicast and bool multicast to set_default_key
Return struct net_device * to add_virtual_intf
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Vipin Mehta <vipin.mehta@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/ath6kl/os/linux/cfg80211.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/ath6kl/os/linux/cfg80211.c b/drivers/staging/ath6kl/os/linux/cfg80211.c index 7269d0a1d61..cbd9d55a293 100644 --- a/drivers/staging/ath6kl/os/linux/cfg80211.c +++ b/drivers/staging/ath6kl/os/linux/cfg80211.c | |||
@@ -978,7 +978,7 @@ ar6k_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev, | |||
978 | 978 | ||
979 | static int | 979 | static int |
980 | ar6k_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *ndev, | 980 | ar6k_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *ndev, |
981 | A_UINT8 key_index) | 981 | A_UINT8 key_index, bool unicast, bool multicast) |
982 | { | 982 | { |
983 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev); | 983 | AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev); |
984 | struct ar_key *key = NULL; | 984 | struct ar_key *key = NULL; |
@@ -1201,7 +1201,7 @@ ar6k_cfg80211_set_power_mgmt(struct wiphy *wiphy, | |||
1201 | return 0; | 1201 | return 0; |
1202 | } | 1202 | } |
1203 | 1203 | ||
1204 | static int | 1204 | static struct net_device * |
1205 | ar6k_cfg80211_add_virtual_intf(struct wiphy *wiphy, char *name, | 1205 | ar6k_cfg80211_add_virtual_intf(struct wiphy *wiphy, char *name, |
1206 | enum nl80211_iftype type, u32 *flags, | 1206 | enum nl80211_iftype type, u32 *flags, |
1207 | struct vif_params *params) | 1207 | struct vif_params *params) |
@@ -1212,7 +1212,7 @@ ar6k_cfg80211_add_virtual_intf(struct wiphy *wiphy, char *name, | |||
1212 | /* Multiple virtual interface is not supported. | 1212 | /* Multiple virtual interface is not supported. |
1213 | * The default interface supports STA and IBSS type | 1213 | * The default interface supports STA and IBSS type |
1214 | */ | 1214 | */ |
1215 | return -EOPNOTSUPP; | 1215 | return ERR_PTR(-EOPNOTSUPP); |
1216 | } | 1216 | } |
1217 | 1217 | ||
1218 | static int | 1218 | static int |