evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: ath6kl: Update cfg80211 to recent calling convention changes

Browse source 
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>
This commit is contained in:
Joe Perches 2011-01-27 20:04:18 -08:00 • committed by Greg Kroah-Hartman
parent d7ddd16933
commit a789325dc3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/ath6kl/os/linux/cfg80211.c
View file

@ -978,7 +978,7 @@ ar6k_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,
static int
ar6k_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *ndev,
A_UINT8 key_index)
A_UINT8 key_index, bool unicast, bool multicast)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(ndev);
struct ar_key *key = NULL;
@ -1201,7 +1201,7 @@ ar6k_cfg80211_set_power_mgmt(struct wiphy *wiphy,
return 0;
}
static int
static struct net_device *
ar6k_cfg80211_add_virtual_intf(struct wiphy *wiphy, char *name,
enum nl80211_iftype type, u32 *flags,
struct vif_params *params)
@ -1212,7 +1212,7 @@ ar6k_cfg80211_add_virtual_intf(struct wiphy *wiphy, char *name,
/* Multiple virtual interface is not supported.
* The default interface supports STA and IBSS type
*/
return -EOPNOTSUPP;
return ERR_PTR(-EOPNOTSUPP);
}
static int