diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-07-29 14:47:07 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-29 14:47:07 -0400 |
| commit | ae3568adf42d5d3bb3cfa505b94351c5d1ce4924 (patch) | |
| tree | 112865a6e6b1e4ddf70362f3efb295c495ec85b9 /drivers/net/wireless/ipw2x00/libipw_wx.c | |
| parent | 7f3e01fee41a322747db2d7574516d9fbd3785c0 (diff) | |
| parent | b7753c8cd51dce67a0b152efb456a21ff1cc241b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/ipw2x00/libipw_wx.c')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/libipw_wx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2x00/libipw_wx.c b/drivers/net/wireless/ipw2x00/libipw_wx.c index 8a4bae44b109..d7bd6cf00a81 100644 --- a/drivers/net/wireless/ipw2x00/libipw_wx.c +++ b/drivers/net/wireless/ipw2x00/libipw_wx.c | |||
| @@ -320,7 +320,7 @@ int libipw_wx_set_encode(struct libipw_device *ieee, | |||
| 320 | }; | 320 | }; |
| 321 | int i, key, key_provided, len; | 321 | int i, key, key_provided, len; |
| 322 | struct lib80211_crypt_data **crypt; | 322 | struct lib80211_crypt_data **crypt; |
| 323 | int host_crypto = ieee->host_encrypt || ieee->host_decrypt || ieee->host_build_iv; | 323 | int host_crypto = ieee->host_encrypt || ieee->host_decrypt; |
| 324 | DECLARE_SSID_BUF(ssid); | 324 | DECLARE_SSID_BUF(ssid); |
| 325 | 325 | ||
| 326 | LIBIPW_DEBUG_WX("SET_ENCODE\n"); | 326 | LIBIPW_DEBUG_WX("SET_ENCODE\n"); |