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.h | |
| 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.h')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/libipw.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2x00/libipw.h b/drivers/net/wireless/ipw2x00/libipw.h index 4736861bc4f8..70f5586d96bd 100644 --- a/drivers/net/wireless/ipw2x00/libipw.h +++ b/drivers/net/wireless/ipw2x00/libipw.h | |||
| @@ -828,7 +828,6 @@ struct libipw_device { | |||
| 828 | int host_strip_iv_icv; | 828 | int host_strip_iv_icv; |
| 829 | 829 | ||
| 830 | int host_open_frag; | 830 | int host_open_frag; |
| 831 | int host_build_iv; | ||
| 832 | int ieee802_1x; /* is IEEE 802.1X used */ | 831 | int ieee802_1x; /* is IEEE 802.1X used */ |
| 833 | 832 | ||
| 834 | /* WPA data */ | 833 | /* WPA data */ |