Linux wireless drivers development
 help / color / mirror / Atom feed
From: Bing Zhao <bzhao@marvell.com>
To: linux-wireless@vger.kernel.org
Cc: "John W. Linville" <linville@tuxdriver.com>,
	Johannes Berg <johannes@sipsolutions.net>,
	Amitkumar Karwar <akarwar@marvell.com>,
	Kiran Divekar <dkiran@marvell.com>,
	Frank Huang <frankh@marvell.com>, Bing Zhao <bzhao@marvell.com>
Subject: [PATCH 2/4] mwifiex: modify set_default_key() prototype
Date: Wed, 15 Dec 2010 16:57:57 -0800	[thread overview]
Message-ID: <1292461079-26318-2-git-send-email-bzhao@marvell.com> (raw)
In-Reply-To: <1292461079-26318-1-git-send-email-bzhao@marvell.com>

From: Amitkumar Karwar <akarwar@marvell.com>

This fixes compilation warning introduced recently due to
set_default_key prototype change in cfg80211.h (dbd2fd6 by
Johannes Berg):

cfg80211/nl80211: separate unicast/multicast default TX keys

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
---
 drivers/net/wireless/mwifiex/cfg80211.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 99dade5..8d74446 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -64,7 +64,8 @@ static int mwifiex_cfg80211_del_key(struct wiphy *wiphy,
 
 static int mwifiex_cfg80211_set_default_key(struct wiphy *wiphy,
 					    struct net_device *netdev,
-					    u8 key_index);
+					    u8 key_index, bool unicast,
+					    bool multicast);
 static int mwifiex_cfg80211_set_power_mgmt(struct wiphy *wiphy,
 					   struct net_device *dev, bool enabled,
 					   int timeout);
@@ -314,7 +315,8 @@ mwifiex_cfg80211_set_power_mgmt(struct wiphy *wiphy,
  */
 static int
 mwifiex_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *netdev,
-				 u8 key_index)
+				 u8 key_index, bool unicast,
+				 bool multicast)
 {
 	return 0;
 }
-- 
1.7.0.2


  reply	other threads:[~2010-12-16  0:58 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-16  0:57 [PATCH 1/4] mwifiex: remove wrapper functions for spin_lock/spin_unlock Bing Zhao
2010-12-16  0:57 ` Bing Zhao [this message]
2010-12-16  0:57 ` [PATCH 3/4] mwifiex: keep exactly one space after #include Bing Zhao
2010-12-16  0:57 ` [PATCH 4/4] mwifiex: convert uses of __attribute__ ((packed)) to __packed Bing Zhao

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=1292461079-26318-2-git-send-email-bzhao@marvell.com \
    --to=bzhao@marvell.com \
    --cc=akarwar@marvell.com \
    --cc=dkiran@marvell.com \
    --cc=frankh@marvell.com \
    --cc=johannes@sipsolutions.net \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox