diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2009-07-01 21:26:54 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-07-10 15:01:51 -0400 |
| commit | b23aa676ab9d54469cda9f7151f51a2851c6f36e (patch) | |
| tree | dd4af5fa38dbfec362ded1d655ed584bbcf60a53 /net/mac80211 | |
| parent | 6a669e65c5ec393a650362874e13f7d3365a7827 (diff) | |
| download | kernel-crypto-b23aa676ab9d54469cda9f7151f51a2851c6f36e.tar.gz kernel-crypto-b23aa676ab9d54469cda9f7151f51a2851c6f36e.tar.xz kernel-crypto-b23aa676ab9d54469cda9f7151f51a2851c6f36e.zip | |
cfg80211: connect/disconnect API
This patch introduces the cfg80211 connect/disconnect API.
The goal here is to run the AUTH and ASSOC steps in one call.
This is needed for some fullmac cards that run both steps
directly from the target, after the host driver sends a
connect command.
Additionally, all the new crypto parameters for connect()
are now also valid for associate() -- although associate
requires the IEs to be used, the information can be useful
for drivers and should be given.
Signed-off-by: Samuel Ortiz <samuel.ortiz@intel.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/cfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index c34c1a41019..03de4024597 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1262,7 +1262,7 @@ static int ieee80211_assoc(struct wiphy *wiphy, struct net_device *dev, sdata->u.mgd.flags &= ~IEEE80211_STA_MFP_ENABLED; } - if (req->control_port) + if (req->crypto.control_port) sdata->u.mgd.flags |= IEEE80211_STA_CONTROL_PORT; else sdata->u.mgd.flags &= ~IEEE80211_STA_CONTROL_PORT; |