diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-10-20 00:26:44 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-10-20 00:26:44 -0400 |
| commit | 748c5151deb56e4b7b5a9b07a884243764933831 (patch) | |
| tree | e9dd45b8806d00b56503cfa55c46f3ebce0d151c /net/ieee80211/ieee80211_wx.c | |
| parent | 4879b44829d94a1f8facf90cced3c5f23c5a8c62 (diff) | |
| parent | e8b8c977734193adedf2b0f607d6252c78e86394 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/ieee80211/ieee80211_wx.c')
| -rw-r--r-- | net/ieee80211/ieee80211_wx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c index 9b58dd67acb6..d309e8f19992 100644 --- a/net/ieee80211/ieee80211_wx.c +++ b/net/ieee80211/ieee80211_wx.c | |||
| @@ -409,7 +409,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee, | |||
| 409 | (*crypt)->priv); | 409 | (*crypt)->priv); |
| 410 | sec.flags |= (1 << key); | 410 | sec.flags |= (1 << key); |
| 411 | /* This ensures a key will be activated if no key is | 411 | /* This ensures a key will be activated if no key is |
| 412 | * explicitely set */ | 412 | * explicitly set */ |
| 413 | if (key == sec.active_key) | 413 | if (key == sec.active_key) |
| 414 | sec.flags |= SEC_ACTIVE_KEY; | 414 | sec.flags |= SEC_ACTIVE_KEY; |
| 415 | 415 | ||