lkml.org 
[lkml]   [2011]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 01/15] staging: ath6kl: Update cfg80211 to recent calling convention changes
Date
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>
---
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 7269d0a..cbd9d55 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,

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
--
1.7.4.rc3


\
 
 \ /
  Last update: 2011-01-28 05:07    [W:0.128 / U:1.368 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site