From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: Michael Wu <flamingice@sourmilk.net>, linux-wireless@vger.kernel.org
Subject: [PATCH 19/21] mac80211: remove crypto algorithm typedef
Date: Thu, 06 Sep 2007 01:42:28 +0200 [thread overview]
Message-ID: <20070905234630.731410000@sipsolutions.net> (raw)
In-Reply-To: 20070905234209.108005000@sipsolutions.net
The typedef is not required, we can just use "enum ieee80211_key_alg"
instead of "ieee80211_key_alg"
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
drivers/net/wireless/b43/main.c | 6 +++---
drivers/net/wireless/iwl-base.c | 2 +-
drivers/net/wireless/iwlwifi.h | 2 +-
include/net/mac80211.h | 12 ++++++------
net/mac80211/ieee80211_key.h | 2 +-
net/mac80211/key.c | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
--- wireless-dev.orig/include/net/mac80211.h 2007-09-06 01:35:21.044453431 +0200
+++ wireless-dev/include/net/mac80211.h 2007-09-06 01:35:28.094453431 +0200
@@ -551,12 +551,12 @@ struct ieee80211_if_conf {
* @ALG_TKIP: TKIP
* @ALG_CCMP: CCMP (AES)
*/
-typedef enum ieee80211_key_alg {
+enum ieee80211_key_alg {
ALG_NONE,
ALG_WEP,
ALG_TKIP,
ALG_CCMP,
-} ieee80211_key_alg;
+};
/**
@@ -596,7 +596,7 @@ enum ieee80211_key_flags {
* @key: key material
*/
struct ieee80211_key_conf {
- ieee80211_key_alg alg;
+ enum ieee80211_key_alg alg;
u8 hw_key_idx;
u8 flags;
s8 keyidx;
@@ -616,9 +616,9 @@ struct ieee80211_key_conf {
* @SET_KEY: a key is set
* @DISABLE_KEY: a key must be disabled
*/
-typedef enum set_key_cmd {
+enum set_key_cmd {
SET_KEY, DISABLE_KEY,
-} set_key_cmd;
+};
/**
@@ -1035,7 +1035,7 @@ struct ieee80211_ops {
unsigned int changed_flags,
unsigned int *total_flags);
int (*set_tim)(struct ieee80211_hw *hw, int aid, int set);
- int (*set_key)(struct ieee80211_hw *hw, set_key_cmd cmd,
+ int (*set_key)(struct ieee80211_hw *hw, enum set_key_cmd cmd,
const u8 *local_address, const u8 *address,
struct ieee80211_key_conf *key);
int (*set_ieee8021x)(struct ieee80211_hw *hw, int use_ieee8021x);
--- wireless-dev.orig/net/mac80211/ieee80211_key.h 2007-09-06 01:34:53.224453431 +0200
+++ wireless-dev/net/mac80211/ieee80211_key.h 2007-09-06 01:35:28.094453431 +0200
@@ -114,7 +114,7 @@ struct ieee80211_key {
struct ieee80211_key *ieee80211_key_alloc(struct ieee80211_sub_if_data *sdata,
struct sta_info *sta,
- ieee80211_key_alg alg,
+ enum ieee80211_key_alg alg,
int idx,
size_t key_len,
const u8 *key_data);
--- wireless-dev.orig/net/mac80211/key.c 2007-09-06 01:34:53.274453431 +0200
+++ wireless-dev/net/mac80211/key.c 2007-09-06 01:35:28.124453431 +0200
@@ -111,7 +111,7 @@ static void ieee80211_key_disable_hw_acc
struct ieee80211_key *ieee80211_key_alloc(struct ieee80211_sub_if_data *sdata,
struct sta_info *sta,
- ieee80211_key_alg alg,
+ enum ieee80211_key_alg alg,
int idx,
size_t key_len,
const u8 *key_data)
--- wireless-dev.orig/drivers/net/wireless/iwlwifi.h 2007-09-06 01:34:53.304453431 +0200
+++ wireless-dev/drivers/net/wireless/iwlwifi.h 2007-09-06 01:35:28.124453431 +0200
@@ -417,7 +417,7 @@ struct iwl_tid_data {
};
struct iwl_hw_key {
- ieee80211_key_alg alg;
+ enum ieee80211_key_alg alg;
int keylen;
u8 key[32];
};
--- wireless-dev.orig/drivers/net/wireless/b43/main.c 2007-09-06 01:35:12.374453431 +0200
+++ wireless-dev/drivers/net/wireless/b43/main.c 2007-09-06 01:35:28.124453431 +0200
@@ -2850,9 +2850,9 @@ static int b43_dev_config(struct ieee802
return err;
}
-static int b43_dev_set_key(struct ieee80211_hw *hw,
- set_key_cmd cmd, const u8 *local_addr,
- const u8 *addr, struct ieee80211_key_conf *key)
+static int b43_dev_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
+ const u8 *local_addr, const u8 *addr,
+ struct ieee80211_key_conf *key)
{
struct b43_wl *wl = hw_to_b43_wl(hw);
struct b43_wldev *dev = wl->current_dev;
--- wireless-dev.orig/drivers/net/wireless/iwl-base.c 2007-09-06 01:35:12.394453431 +0200
+++ wireless-dev/drivers/net/wireless/iwl-base.c 2007-09-06 01:35:28.144453431 +0200
@@ -7866,7 +7866,7 @@ static int iwl_mac_hw_scan(struct ieee80
return rc;
}
-static int iwl_mac_set_key(struct ieee80211_hw *hw, set_key_cmd cmd,
+static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
const u8 *local_addr, const u8 *addr,
struct ieee80211_key_conf *key)
{
--
next prev parent reply other threads:[~2007-09-06 13:46 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-05 23:42 [PATCH 00/21] more mac80211 updates Johannes Berg
2007-09-05 23:42 ` [PATCH 01/21] mac80211: get STA after tx radiotap snipped Johannes Berg
2007-09-05 23:42 ` [PATCH 02/21] mac80211: allow drivers to indicate failed FCS/PLCP checksum Johannes Berg
2007-09-05 23:42 ` [PATCH 03/21] mac80211: revamp interface and filter configuration Johannes Berg
2007-09-06 14:28 ` Michael Buesch
2007-09-06 14:46 ` Johannes Berg
2007-09-06 17:05 ` Ivo van Doorn
2007-09-07 13:23 ` Johannes Berg
2007-09-07 17:56 ` Ivo van Doorn
2007-09-14 3:50 ` Michael Wu
2007-09-14 12:06 ` Johannes Berg
2007-09-05 23:42 ` [PATCH 04/21] mac80211: validate VLAN interfaces better Johannes Berg
2007-09-05 23:42 ` [PATCH 05/21] mac80211: remove key threshold stuff Johannes Berg
2007-09-05 23:42 ` [PATCH 06/21] mac80211: remove IEEE80211_CONF_SSID_HIDDEN and PRISM2_PARAM_BROADCAST_SSID Johannes Berg
2007-09-05 23:42 ` [PATCH 07/21] mac80211: renumber and document the hardware flags Johannes Berg
2007-09-05 23:42 ` [PATCH 08/21] mac80211: document a lot more Johannes Berg
2007-09-05 23:42 ` [PATCH 09/21] wireless networking: move frame inline functions to generic header Johannes Berg
2007-09-05 23:42 ` [PATCH 10/21] mac80211: yet more documentation Johannes Berg
2007-09-05 23:42 ` [PATCH 11/21] mac80211: fix warnings introduced by the doc patches Johannes Berg
2007-09-05 23:42 ` [PATCH 12/21] mac80211: remove tx info sw_retry_attempt member Johannes Berg
2007-09-05 23:42 ` [PATCH 13/21] mac80211: print out wiphy name instead of master device Johannes Berg
2007-09-05 23:42 ` [PATCH 14/21] mac80211 maintainership Johannes Berg
2007-09-05 23:42 ` [PATCH 15/21] mac80211: rename ieee80211_cfg.c to cfg.c Johannes Berg
2007-09-05 23:42 ` [PATCH 16/21] mac80211: consolidate decryption Johannes Berg
2007-09-05 23:42 ` [PATCH 17/21] mac80211: consolidate encryption Johannes Berg
2007-09-05 23:42 ` [PATCH 18/21] mac80211: remove ieee80211_wep_get_keyidx Johannes Berg
2007-09-05 23:42 ` Johannes Berg [this message]
2007-09-05 23:42 ` [PATCH 20/21] mac80211: kill IE parse typedef Johannes Berg
2007-09-05 23:42 ` [PATCH 21/21] mac80211: kill vlan_id Johannes Berg
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=20070905234630.731410000@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=flamingice@sourmilk.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.