diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 12:39:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 12:39:05 -0500 |
| commit | cf10b2853f86e714eac7117484c0d368ce710fa4 (patch) | |
| tree | 6f1574a9de786c8c345ac852eff12d65b2d75bfe /net/ieee80211/ieee80211_wx.c | |
| parent | 14591de147f7c9656fa2b9c05680d2b46e286c40 (diff) | |
| parent | 166c3436d683cfe5316c7723ed746a93db053f12 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-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 181755f2aa8b..406d5b964905 100644 --- a/net/ieee80211/ieee80211_wx.c +++ b/net/ieee80211/ieee80211_wx.c | |||
| @@ -284,7 +284,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee, | |||
| 284 | }; | 284 | }; |
| 285 | int i, key, key_provided, len; | 285 | int i, key, key_provided, len; |
| 286 | struct ieee80211_crypt_data **crypt; | 286 | struct ieee80211_crypt_data **crypt; |
| 287 | int host_crypto = ieee->host_encrypt || ieee->host_decrypt; | 287 | int host_crypto = ieee->host_encrypt || ieee->host_decrypt || ieee->host_build_iv; |
| 288 | 288 | ||
| 289 | IEEE80211_DEBUG_WX("SET_ENCODE\n"); | 289 | IEEE80211_DEBUG_WX("SET_ENCODE\n"); |
| 290 | 290 | ||