aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/assoc.c
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2007-11-23 09:43:44 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:04:54 -0500
commit69f9032d9dfeb763b467fdbe8cf5938f5457083a (patch)
tree613598938e17e1a7514e0da3817f3cfebbe346a9 /drivers/net/wireless/libertas/assoc.c
parent96287ac4f7b387acbe17e24b5e1bcbf3bc0e75cd (diff)
libertas: remove arbitrary typedefs
New typedefs are usually frowned upon. This patch changes libertas_adapter -> struct libertas_adapter libertas_priv -> struct libertas_priv While passing, make everything checkpatch.pl-clean that gets touches. Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Acked-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/assoc.c')
-rw-r--r--drivers/net/wireless/libertas/assoc.c48
1 files changed, 25 insertions, 23 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index f634c9496ec2..b529e54151d6 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -15,10 +15,10 @@ static const u8 bssid_any[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
15static const u8 bssid_off[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; 15static const u8 bssid_off[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
16 16
17 17
18static int assoc_helper_essid(lbs_private *priv, 18static int assoc_helper_essid(struct lbs_private *priv,
19 struct assoc_request * assoc_req) 19 struct assoc_request * assoc_req)
20{ 20{
21 lbs_adapter *adapter = priv->adapter; 21 struct lbs_adapter *adapter = priv->adapter;
22 int ret = 0; 22 int ret = 0;
23 struct bss_descriptor * bss; 23 struct bss_descriptor * bss;
24 int channel = -1; 24 int channel = -1;
@@ -75,10 +75,10 @@ static int assoc_helper_essid(lbs_private *priv,
75} 75}
76 76
77 77
78static int assoc_helper_bssid(lbs_private *priv, 78static int assoc_helper_bssid(struct lbs_private *priv,
79 struct assoc_request * assoc_req) 79 struct assoc_request * assoc_req)
80{ 80{
81 lbs_adapter *adapter = priv->adapter; 81 struct lbs_adapter *adapter = priv->adapter;
82 int ret = 0; 82 int ret = 0;
83 struct bss_descriptor * bss; 83 struct bss_descriptor * bss;
84 DECLARE_MAC_BUF(mac); 84 DECLARE_MAC_BUF(mac);
@@ -109,7 +109,7 @@ out:
109} 109}
110 110
111 111
112static int assoc_helper_associate(lbs_private *priv, 112static int assoc_helper_associate(struct lbs_private *priv,
113 struct assoc_request * assoc_req) 113 struct assoc_request * assoc_req)
114{ 114{
115 int ret = 0, done = 0; 115 int ret = 0, done = 0;
@@ -135,10 +135,10 @@ static int assoc_helper_associate(lbs_private *priv,
135} 135}
136 136
137 137
138static int assoc_helper_mode(lbs_private *priv, 138static int assoc_helper_mode(struct lbs_private *priv,
139 struct assoc_request * assoc_req) 139 struct assoc_request * assoc_req)
140{ 140{
141 lbs_adapter *adapter = priv->adapter; 141 struct lbs_adapter *adapter = priv->adapter;
142 int ret = 0; 142 int ret = 0;
143 143
144 lbs_deb_enter(LBS_DEB_ASSOC); 144 lbs_deb_enter(LBS_DEB_ASSOC);
@@ -165,7 +165,7 @@ done:
165} 165}
166 166
167 167
168static int update_channel(lbs_private * priv) 168static int update_channel(struct lbs_private *priv)
169{ 169{
170 int ret; 170 int ret;
171 /* the channel in f/w could be out of sync, get the current channel */ 171 /* the channel in f/w could be out of sync, get the current channel */
@@ -179,7 +179,8 @@ static int update_channel(lbs_private * priv)
179 179
180void lbs_sync_channel(struct work_struct *work) 180void lbs_sync_channel(struct work_struct *work)
181{ 181{
182 lbs_private *priv = container_of(work, lbs_private, sync_channel); 182 struct lbs_private *priv = container_of(work, struct lbs_private,
183 sync_channel);
183 184
184 lbs_deb_enter(LBS_DEB_ASSOC); 185 lbs_deb_enter(LBS_DEB_ASSOC);
185 if (update_channel(priv) != 0) 186 if (update_channel(priv) != 0)
@@ -187,10 +188,10 @@ void lbs_sync_channel(struct work_struct *work)
187 lbs_deb_leave(LBS_DEB_ASSOC); 188 lbs_deb_leave(LBS_DEB_ASSOC);
188} 189}
189 190
190static int assoc_helper_channel(lbs_private *priv, 191static int assoc_helper_channel(struct lbs_private *priv,
191 struct assoc_request * assoc_req) 192 struct assoc_request * assoc_req)
192{ 193{
193 lbs_adapter *adapter = priv->adapter; 194 struct lbs_adapter *adapter = priv->adapter;
194 int ret = 0; 195 int ret = 0;
195 196
196 lbs_deb_enter(LBS_DEB_ASSOC); 197 lbs_deb_enter(LBS_DEB_ASSOC);
@@ -242,10 +243,10 @@ done:
242} 243}
243 244
244 245
245static int assoc_helper_wep_keys(lbs_private *priv, 246static int assoc_helper_wep_keys(struct lbs_private *priv,
246 struct assoc_request * assoc_req) 247 struct assoc_request * assoc_req)
247{ 248{
248 lbs_adapter *adapter = priv->adapter; 249 struct lbs_adapter *adapter = priv->adapter;
249 int i; 250 int i;
250 int ret = 0; 251 int ret = 0;
251 252
@@ -297,10 +298,10 @@ out:
297 return ret; 298 return ret;
298} 299}
299 300
300static int assoc_helper_secinfo(lbs_private *priv, 301static int assoc_helper_secinfo(struct lbs_private *priv,
301 struct assoc_request * assoc_req) 302 struct assoc_request * assoc_req)
302{ 303{
303 lbs_adapter *adapter = priv->adapter; 304 struct lbs_adapter *adapter = priv->adapter;
304 int ret = 0; 305 int ret = 0;
305 u32 do_wpa; 306 u32 do_wpa;
306 u32 rsn = 0; 307 u32 rsn = 0;
@@ -349,7 +350,7 @@ out:
349} 350}
350 351
351 352
352static int assoc_helper_wpa_keys(lbs_private *priv, 353static int assoc_helper_wpa_keys(struct lbs_private *priv,
353 struct assoc_request * assoc_req) 354 struct assoc_request * assoc_req)
354{ 355{
355 int ret = 0; 356 int ret = 0;
@@ -392,10 +393,10 @@ out:
392} 393}
393 394
394 395
395static int assoc_helper_wpa_ie(lbs_private *priv, 396static int assoc_helper_wpa_ie(struct lbs_private *priv,
396 struct assoc_request * assoc_req) 397 struct assoc_request * assoc_req)
397{ 398{
398 lbs_adapter *adapter = priv->adapter; 399 struct lbs_adapter *adapter = priv->adapter;
399 int ret = 0; 400 int ret = 0;
400 401
401 lbs_deb_enter(LBS_DEB_ASSOC); 402 lbs_deb_enter(LBS_DEB_ASSOC);
@@ -413,7 +414,7 @@ static int assoc_helper_wpa_ie(lbs_private *priv,
413} 414}
414 415
415 416
416static int should_deauth_infrastructure(lbs_adapter *adapter, 417static int should_deauth_infrastructure(struct lbs_adapter *adapter,
417 struct assoc_request * assoc_req) 418 struct assoc_request * assoc_req)
418{ 419{
419 int ret = 0; 420 int ret = 0;
@@ -465,7 +466,7 @@ out:
465} 466}
466 467
467 468
468static int should_stop_adhoc(lbs_adapter *adapter, 469static int should_stop_adhoc(struct lbs_adapter *adapter,
469 struct assoc_request * assoc_req) 470 struct assoc_request * assoc_req)
470{ 471{
471 lbs_deb_enter(LBS_DEB_ASSOC); 472 lbs_deb_enter(LBS_DEB_ASSOC);
@@ -496,8 +497,9 @@ static int should_stop_adhoc(lbs_adapter *adapter,
496 497
497void lbs_association_worker(struct work_struct *work) 498void lbs_association_worker(struct work_struct *work)
498{ 499{
499 lbs_private *priv = container_of(work, lbs_private, assoc_work.work); 500 struct lbs_private *priv = container_of(work, struct lbs_private,
500 lbs_adapter *adapter = priv->adapter; 501 assoc_work.work);
502 struct lbs_adapter *adapter = priv->adapter;
501 struct assoc_request * assoc_req = NULL; 503 struct assoc_request * assoc_req = NULL;
502 int ret = 0; 504 int ret = 0;
503 int find_any_ssid = 0; 505 int find_any_ssid = 0;
@@ -684,7 +686,7 @@ done:
684/* 686/*
685 * Caller MUST hold any necessary locks 687 * Caller MUST hold any necessary locks
686 */ 688 */
687struct assoc_request *lbs_get_association_request(lbs_adapter *adapter) 689struct assoc_request *lbs_get_association_request(struct lbs_adapter *adapter)
688{ 690{
689 struct assoc_request * assoc_req; 691 struct assoc_request * assoc_req;
690 692