mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
WorkStruct: make allyesconfig
Fix up for make allyesconfig. Signed-Off-By: David Howells <[email protected]>
This commit is contained in:
parent
65f27f3844
commit
c4028958b6
282 changed files with 1771 additions and 1450 deletions
|
|
@ -58,9 +58,11 @@ ieee80211softmac_assoc(struct ieee80211softmac_device *mac, struct ieee80211soft
|
|||
}
|
||||
|
||||
void
|
||||
ieee80211softmac_assoc_timeout(void *d)
|
||||
ieee80211softmac_assoc_timeout(struct work_struct *work)
|
||||
{
|
||||
struct ieee80211softmac_device *mac = (struct ieee80211softmac_device *)d;
|
||||
struct ieee80211softmac_device *mac =
|
||||
container_of(work, struct ieee80211softmac_device,
|
||||
associnfo.timeout.work);
|
||||
struct ieee80211softmac_network *n;
|
||||
|
||||
mutex_lock(&mac->associnfo.mutex);
|
||||
|
|
@ -186,9 +188,11 @@ ieee80211softmac_assoc_notify_auth(struct net_device *dev, int event_type, void
|
|||
|
||||
/* This function is called to handle userspace requests (asynchronously) */
|
||||
void
|
||||
ieee80211softmac_assoc_work(void *d)
|
||||
ieee80211softmac_assoc_work(struct work_struct *work)
|
||||
{
|
||||
struct ieee80211softmac_device *mac = (struct ieee80211softmac_device *)d;
|
||||
struct ieee80211softmac_device *mac =
|
||||
container_of(work, struct ieee80211softmac_device,
|
||||
associnfo.work.work);
|
||||
struct ieee80211softmac_network *found = NULL;
|
||||
struct ieee80211_network *net = NULL, *best = NULL;
|
||||
int bssvalid;
|
||||
|
|
@ -412,7 +416,7 @@ ieee80211softmac_handle_assoc_response(struct net_device * dev,
|
|||
network->authenticated = 0;
|
||||
/* we don't want to do this more than once ... */
|
||||
network->auth_desynced_once = 1;
|
||||
schedule_work(&mac->associnfo.work);
|
||||
schedule_delayed_work(&mac->associnfo.work, 0);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
@ -446,7 +450,7 @@ ieee80211softmac_handle_disassoc(struct net_device * dev,
|
|||
ieee80211softmac_disassoc(mac);
|
||||
|
||||
/* try to reassociate */
|
||||
schedule_work(&mac->associnfo.work);
|
||||
schedule_delayed_work(&mac->associnfo.work, 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -466,7 +470,7 @@ ieee80211softmac_handle_reassoc_req(struct net_device * dev,
|
|||
dprintkl(KERN_INFO PFX "reassoc request from unknown network\n");
|
||||
return 0;
|
||||
}
|
||||
schedule_work(&mac->associnfo.work);
|
||||
schedule_delayed_work(&mac->associnfo.work, 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include "ieee80211softmac_priv.h"
|
||||
|
||||
static void ieee80211softmac_auth_queue(void *data);
|
||||
static void ieee80211softmac_auth_queue(struct work_struct *work);
|
||||
|
||||
/* Queues an auth request to the desired AP */
|
||||
int
|
||||
|
|
@ -54,14 +54,14 @@ ieee80211softmac_auth_req(struct ieee80211softmac_device *mac,
|
|||
auth->mac = mac;
|
||||
auth->retry = IEEE80211SOFTMAC_AUTH_RETRY_LIMIT;
|
||||
auth->state = IEEE80211SOFTMAC_AUTH_OPEN_REQUEST;
|
||||
INIT_WORK(&auth->work, &ieee80211softmac_auth_queue, (void *)auth);
|
||||
INIT_DELAYED_WORK(&auth->work, ieee80211softmac_auth_queue);
|
||||
|
||||
/* Lock (for list) */
|
||||
spin_lock_irqsave(&mac->lock, flags);
|
||||
|
||||
/* add to list */
|
||||
list_add_tail(&auth->list, &mac->auth_queue);
|
||||
schedule_work(&auth->work);
|
||||
schedule_delayed_work(&auth->work, 0);
|
||||
spin_unlock_irqrestore(&mac->lock, flags);
|
||||
|
||||
return 0;
|
||||
|
|
@ -70,14 +70,15 @@ ieee80211softmac_auth_req(struct ieee80211softmac_device *mac,
|
|||
|
||||
/* Sends an auth request to the desired AP and handles timeouts */
|
||||
static void
|
||||
ieee80211softmac_auth_queue(void *data)
|
||||
ieee80211softmac_auth_queue(struct work_struct *work)
|
||||
{
|
||||
struct ieee80211softmac_device *mac;
|
||||
struct ieee80211softmac_auth_queue_item *auth;
|
||||
struct ieee80211softmac_network *net;
|
||||
unsigned long flags;
|
||||
|
||||
auth = (struct ieee80211softmac_auth_queue_item *)data;
|
||||
auth = container_of(work, struct ieee80211softmac_auth_queue_item,
|
||||
work.work);
|
||||
net = auth->net;
|
||||
mac = auth->mac;
|
||||
|
||||
|
|
@ -118,9 +119,11 @@ ieee80211softmac_auth_queue(void *data)
|
|||
|
||||
/* Sends a response to an auth challenge (for shared key auth). */
|
||||
static void
|
||||
ieee80211softmac_auth_challenge_response(void *_aq)
|
||||
ieee80211softmac_auth_challenge_response(struct work_struct *work)
|
||||
{
|
||||
struct ieee80211softmac_auth_queue_item *aq = _aq;
|
||||
struct ieee80211softmac_auth_queue_item *aq =
|
||||
container_of(work, struct ieee80211softmac_auth_queue_item,
|
||||
work.work);
|
||||
|
||||
/* Send our response */
|
||||
ieee80211softmac_send_mgt_frame(aq->mac, aq->net, IEEE80211_STYPE_AUTH, aq->state);
|
||||
|
|
@ -228,8 +231,8 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth)
|
|||
* we have obviously already sent the initial auth
|
||||
* request. */
|
||||
cancel_delayed_work(&aq->work);
|
||||
INIT_WORK(&aq->work, &ieee80211softmac_auth_challenge_response, (void *)aq);
|
||||
schedule_work(&aq->work);
|
||||
INIT_DELAYED_WORK(&aq->work, &ieee80211softmac_auth_challenge_response);
|
||||
schedule_delayed_work(&aq->work, 0);
|
||||
spin_unlock_irqrestore(&mac->lock, flags);
|
||||
return 0;
|
||||
case IEEE80211SOFTMAC_AUTH_SHARED_PASS:
|
||||
|
|
@ -392,6 +395,6 @@ ieee80211softmac_deauth_resp(struct net_device *dev, struct ieee80211_deauth *de
|
|||
ieee80211softmac_deauth_from_net(mac, net);
|
||||
|
||||
/* let's try to re-associate */
|
||||
schedule_work(&mac->associnfo.work);
|
||||
schedule_delayed_work(&mac->associnfo.work, 0);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,10 +73,12 @@ static char *event_descriptions[IEEE80211SOFTMAC_EVENT_LAST+1] = {
|
|||
|
||||
|
||||
static void
|
||||
ieee80211softmac_notify_callback(void *d)
|
||||
ieee80211softmac_notify_callback(struct work_struct *work)
|
||||
{
|
||||
struct ieee80211softmac_event event = *(struct ieee80211softmac_event*) d;
|
||||
kfree(d);
|
||||
struct ieee80211softmac_event *pevent =
|
||||
container_of(work, struct ieee80211softmac_event, work.work);
|
||||
struct ieee80211softmac_event event = *pevent;
|
||||
kfree(pevent);
|
||||
|
||||
event.fun(event.mac->dev, event.event_type, event.context);
|
||||
}
|
||||
|
|
@ -99,7 +101,7 @@ ieee80211softmac_notify_internal(struct ieee80211softmac_device *mac,
|
|||
return -ENOMEM;
|
||||
|
||||
eventptr->event_type = event;
|
||||
INIT_WORK(&eventptr->work, ieee80211softmac_notify_callback, eventptr);
|
||||
INIT_DELAYED_WORK(&eventptr->work, ieee80211softmac_notify_callback);
|
||||
eventptr->fun = fun;
|
||||
eventptr->context = context;
|
||||
eventptr->mac = mac;
|
||||
|
|
@ -170,7 +172,7 @@ ieee80211softmac_call_events_locked(struct ieee80211softmac_device *mac, int eve
|
|||
/* User may have subscribed to ANY event, so
|
||||
* we tell them which event triggered it. */
|
||||
eventptr->event_type = event;
|
||||
schedule_work(&eventptr->work);
|
||||
schedule_delayed_work(&eventptr->work, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,8 +58,8 @@ struct net_device *alloc_ieee80211softmac(int sizeof_priv)
|
|||
INIT_LIST_HEAD(&softmac->events);
|
||||
|
||||
mutex_init(&softmac->associnfo.mutex);
|
||||
INIT_WORK(&softmac->associnfo.work, ieee80211softmac_assoc_work, softmac);
|
||||
INIT_WORK(&softmac->associnfo.timeout, ieee80211softmac_assoc_timeout, softmac);
|
||||
INIT_DELAYED_WORK(&softmac->associnfo.work, ieee80211softmac_assoc_work);
|
||||
INIT_DELAYED_WORK(&softmac->associnfo.timeout, ieee80211softmac_assoc_timeout);
|
||||
softmac->start_scan = ieee80211softmac_start_scan_implementation;
|
||||
softmac->wait_for_scan = ieee80211softmac_wait_for_scan_implementation;
|
||||
softmac->stop_scan = ieee80211softmac_stop_scan_implementation;
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@
|
|||
/* private definitions and prototypes */
|
||||
|
||||
/*** prototypes from _scan.c */
|
||||
void ieee80211softmac_scan(void *sm);
|
||||
void ieee80211softmac_scan(struct work_struct *work);
|
||||
/* for internal use if scanning is needed */
|
||||
int ieee80211softmac_start_scan(struct ieee80211softmac_device *mac);
|
||||
void ieee80211softmac_stop_scan(struct ieee80211softmac_device *mac);
|
||||
|
|
@ -149,7 +149,7 @@ int ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *au
|
|||
int ieee80211softmac_deauth_resp(struct net_device *dev, struct ieee80211_deauth *deauth);
|
||||
|
||||
/*** prototypes from _assoc.c */
|
||||
void ieee80211softmac_assoc_work(void *d);
|
||||
void ieee80211softmac_assoc_work(struct work_struct *work);
|
||||
int ieee80211softmac_handle_assoc_response(struct net_device * dev,
|
||||
struct ieee80211_assoc_response * resp,
|
||||
struct ieee80211_network * network);
|
||||
|
|
@ -157,7 +157,7 @@ int ieee80211softmac_handle_disassoc(struct net_device * dev,
|
|||
struct ieee80211_disassoc * disassoc);
|
||||
int ieee80211softmac_handle_reassoc_req(struct net_device * dev,
|
||||
struct ieee80211_reassoc_request * reassoc);
|
||||
void ieee80211softmac_assoc_timeout(void *d);
|
||||
void ieee80211softmac_assoc_timeout(struct work_struct *work);
|
||||
void ieee80211softmac_send_disassoc_req(struct ieee80211softmac_device *mac, u16 reason);
|
||||
void ieee80211softmac_disassoc(struct ieee80211softmac_device *mac);
|
||||
|
||||
|
|
@ -207,7 +207,7 @@ struct ieee80211softmac_auth_queue_item {
|
|||
struct ieee80211softmac_device *mac; /* SoftMAC device */
|
||||
u8 retry; /* Retry limit */
|
||||
u8 state; /* Auth State */
|
||||
struct work_struct work; /* Work queue */
|
||||
struct delayed_work work; /* Work queue */
|
||||
};
|
||||
|
||||
/* scanning information */
|
||||
|
|
@ -219,7 +219,8 @@ struct ieee80211softmac_scaninfo {
|
|||
stop:1;
|
||||
u8 skip_flags;
|
||||
struct completion finished;
|
||||
struct work_struct softmac_scan;
|
||||
struct delayed_work softmac_scan;
|
||||
struct ieee80211softmac_device *mac;
|
||||
};
|
||||
|
||||
/* private event struct */
|
||||
|
|
@ -227,7 +228,7 @@ struct ieee80211softmac_event {
|
|||
struct list_head list;
|
||||
int event_type;
|
||||
void *event_context;
|
||||
struct work_struct work;
|
||||
struct delayed_work work;
|
||||
notify_function_ptr fun;
|
||||
void *context;
|
||||
struct ieee80211softmac_device *mac;
|
||||
|
|
|
|||
|
|
@ -91,12 +91,14 @@ ieee80211softmac_wait_for_scan(struct ieee80211softmac_device *sm)
|
|||
|
||||
|
||||
/* internal scanning implementation follows */
|
||||
void ieee80211softmac_scan(void *d)
|
||||
void ieee80211softmac_scan(struct work_struct *work)
|
||||
{
|
||||
int invalid_channel;
|
||||
u8 current_channel_idx;
|
||||
struct ieee80211softmac_device *sm = (struct ieee80211softmac_device *)d;
|
||||
struct ieee80211softmac_scaninfo *si = sm->scaninfo;
|
||||
struct ieee80211softmac_scaninfo *si =
|
||||
container_of(work, struct ieee80211softmac_scaninfo,
|
||||
softmac_scan.work);
|
||||
struct ieee80211softmac_device *sm = si->mac;
|
||||
unsigned long flags;
|
||||
|
||||
while (!(si->stop) && (si->current_channel_idx < si->number_channels)) {
|
||||
|
|
@ -146,7 +148,8 @@ static inline struct ieee80211softmac_scaninfo *allocate_scaninfo(struct ieee802
|
|||
struct ieee80211softmac_scaninfo *info = kmalloc(sizeof(struct ieee80211softmac_scaninfo), GFP_ATOMIC);
|
||||
if (unlikely(!info))
|
||||
return NULL;
|
||||
INIT_WORK(&info->softmac_scan, ieee80211softmac_scan, mac);
|
||||
INIT_DELAYED_WORK(&info->softmac_scan, ieee80211softmac_scan);
|
||||
info->mac = mac;
|
||||
init_completion(&info->finished);
|
||||
return info;
|
||||
}
|
||||
|
|
@ -189,7 +192,7 @@ int ieee80211softmac_start_scan_implementation(struct net_device *dev)
|
|||
sm->scaninfo->started = 1;
|
||||
sm->scaninfo->stop = 0;
|
||||
INIT_COMPLETION(sm->scaninfo->finished);
|
||||
schedule_work(&sm->scaninfo->softmac_scan);
|
||||
schedule_delayed_work(&sm->scaninfo->softmac_scan, 0);
|
||||
spin_unlock_irqrestore(&sm->lock, flags);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ ieee80211softmac_wx_set_essid(struct net_device *net_dev,
|
|||
|
||||
sm->associnfo.associating = 1;
|
||||
/* queue lower level code to do work (if necessary) */
|
||||
schedule_work(&sm->associnfo.work);
|
||||
schedule_delayed_work(&sm->associnfo.work, 0);
|
||||
out:
|
||||
mutex_unlock(&sm->associnfo.mutex);
|
||||
|
||||
|
|
@ -356,7 +356,7 @@ ieee80211softmac_wx_set_wap(struct net_device *net_dev,
|
|||
/* force reassociation */
|
||||
mac->associnfo.bssvalid = 0;
|
||||
if (mac->associnfo.associated)
|
||||
schedule_work(&mac->associnfo.work);
|
||||
schedule_delayed_work(&mac->associnfo.work, 0);
|
||||
} else if (is_zero_ether_addr(data->ap_addr.sa_data)) {
|
||||
/* the bssid we have is no longer fixed */
|
||||
mac->associnfo.bssfixed = 0;
|
||||
|
|
@ -373,7 +373,7 @@ ieee80211softmac_wx_set_wap(struct net_device *net_dev,
|
|||
/* tell the other code that this bssid should be used no matter what */
|
||||
mac->associnfo.bssfixed = 1;
|
||||
/* queue associate if new bssid or (old one again and not associated) */
|
||||
schedule_work(&mac->associnfo.work);
|
||||
schedule_delayed_work(&mac->associnfo.work, 0);
|
||||
}
|
||||
|
||||
out:
|
||||
|
|
|
|||
Loading…
Reference in a new issue