projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WorkStruct: make allyesconfig
[deliverable/linux.git]
/
net
/
ieee80211
/
softmac
/
ieee80211softmac_assoc.c
diff --git
a/net/ieee80211/softmac/ieee80211softmac_assoc.c
b/net/ieee80211/softmac/ieee80211softmac_assoc.c
index cf51c87a971d786f0035b7e5d34cc6076889cc23..08386c102954c07dc7b0a18108c12564a6ff7740 100644
(file)
--- a/
net/ieee80211/softmac/ieee80211softmac_assoc.c
+++ b/
net/ieee80211/softmac/ieee80211softmac_assoc.c
@@
-58,9
+58,11
@@
ieee80211softmac_assoc(struct ieee80211softmac_device *mac, struct ieee80211soft
}
void
}
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);
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
/* 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;
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;
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:
break;
}
default:
@@
-446,7
+450,7
@@
ieee80211softmac_handle_disassoc(struct net_device * dev,
ieee80211softmac_disassoc(mac);
/* try to reassociate */
ieee80211softmac_disassoc(mac);
/* try to reassociate */
- schedule_
work(&mac->associnfo.work
);
+ schedule_
delayed_work(&mac->associnfo.work, 0
);
return 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;
}
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;
}
return 0;
}
This page took
0.024573 seconds
and
5
git commands to generate.