From 004944a1e5abf2d95c1d31d96496a021aad71aa2 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Thu, 27 Jan 2011 20:04:18 -0800
Subject: [PATCH] --- yaml --- r: 235735 b: refs/heads/master c:
 a789325dc3aa89bb5001d26b542d7abc775b46f1 h: refs/heads/master i:   235733:
 6cef4a3f62615dfa583bb4dc9191f20dc5b3bfb6   235731:
 e7f6e0b98f9b36c794a1d797bb58145c059f0659   235727:
 5b4f95329dc60bcae8daa5b3df7ea7e5b27abb3d v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/staging/ath6kl/os/linux/cfg80211.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 97683dd1c498..fd9105b099a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7ddd16933ca9f7957b6caed5b323f7f167faa60
+refs/heads/master: a789325dc3aa89bb5001d26b542d7abc775b46f1
diff --git a/trunk/drivers/staging/ath6kl/os/linux/cfg80211.c b/trunk/drivers/staging/ath6kl/os/linux/cfg80211.c
index 7269d0a1d618..cbd9d55a2933 100644
--- a/trunk/drivers/staging/ath6kl/os/linux/cfg80211.c
+++ b/trunk/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