LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Joe Perches <joe@perches.com>
To: Vipin Mehta <vmehta@atheros.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 01/15] staging: ath6kl: Update cfg80211 to recent calling convention changes
Date: Thu, 27 Jan 2011 20:04:18 -0800 [thread overview]
Message-ID: <9f92ccc5786180a9055ee22b28d1b6ea8cbda425.1296186677.git.joe@perches.com> (raw)
In-Reply-To: <cover.1296186677.git.joe@perches.com>
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
next prev parent reply other threads:[~2011-01-28 4:04 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-28 4:04 [git pull-request and PATCH 00/15] staging: ath6kl: Cleanups Joe Perches
2011-01-28 4:04 ` Joe Perches [this message]
2011-01-28 7:35 ` [PATCH 01/15] staging: ath6kl: Update cfg80211 to recent calling convention changes Dan Carpenter
2011-01-28 7:41 ` Dan Carpenter
2011-01-28 4:04 ` [PATCH 02/15] staging: ath6kl: Convert enum A_STATUS to int Joe Perches
2011-01-28 4:04 ` [PATCH 03/15] staging: ath6kl: Remove A_SUCCESS macro Joe Perches
2011-01-28 4:04 ` [PATCH 04/15] staging: ath6kl: Remove A_FAILED macro Joe Perches
2011-01-28 4:04 ` [PATCH 06/15] staging: ath6kl: Convert bypasswmi to bool Joe Perches
2011-01-28 4:04 ` [PATCH 07/15] staging: ath6kl: Convert type of streamExists to A_UINT8 Joe Perches
2011-01-28 4:04 ` [PATCH 08/15] staging: ath6kl: Convert BDADDR_Present uses to TRUE/FALSE bugfix Joe Perches
2011-01-28 4:04 ` [PATCH 09/15] staging: ath6kl: Convert A_BOOL compressed sets from 0 to FALSE Joe Perches
2011-01-28 4:04 ` [PATCH 10/15] staging: ath6kl: Convert " Joe Perches
2011-01-28 4:04 ` [PATCH 11/15] staging: ath6kl: cfg80211: Convert forceFgScan to A_UINT32 Joe Perches
2011-01-28 4:04 ` [PATCH 12/15] staging: ath6kl: Convert A_UINT8 is_amsdu and is_acl_data_frame to A_BOOL Joe Perches
2011-01-28 11:42 ` Dan Carpenter
2011-01-28 15:45 ` Joe Perches
2011-01-28 4:04 ` [PATCH 13/15] staging: ath6kl: Convert A_NETBUF_QUEUE_EMPTY to return TRUE or FALSE Joe Perches
2011-01-28 4:04 ` [PATCH 14/15] staging: ath6kl: Convert sets of scanSpecificSsid to TRUE/FALSE Joe Perches
2011-01-28 4:04 ` [PATCH 15/15] staging: ath6kl: Convert tspecCompliance from A_BOOL to int Joe Perches
[not found] ` <d1deb8a42497651898ad03bda9018d9deca93f12.1296186677.git.joe@perches.com>
2011-01-28 6:22 ` [PATCH 05/15] staging: ath6kl: wmi.h: Convert packed structures with A_BOOL to u32 Denis Kirjanov
2011-01-28 19:47 ` [git pull-request and PATCH 00/15] staging: ath6kl: Cleanups Vipin Mehta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9f92ccc5786180a9055ee22b28d1b6ea8cbda425.1296186677.git.joe@perches.com \
--to=joe@perches.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=vmehta@atheros.com \
--subject='Re: [PATCH 01/15] staging: ath6kl: Update cfg80211 to recent calling convention changes' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).