diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-08 19:41:27 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-08 19:41:27 +1100 |
| commit | 1ba6faea226e3b1c4ea16eb6e76599c42f154d60 (patch) | |
| tree | 024a65ee19a12f981d107abfd56ab4d1ecbd39e7 /drivers/staging/otus/athr_common.h | |
| parent | 5735b28741a2749d33a3f4d8ce6a42c21449cf68 (diff) | |
| parent | 0bdce268866241836c81ec6ae9ca4156df3b3cc4 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/comedi/drivers/ni_labpc_cs.c
drivers/staging/comedi/drivers/ni_mio_cs.c
Diffstat (limited to 'drivers/staging/otus/athr_common.h')
| -rw-r--r-- | drivers/staging/otus/athr_common.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/otus/athr_common.h b/drivers/staging/otus/athr_common.h index 620f78a41d5f..3e32f5b4ac68 100644 --- a/drivers/staging/otus/athr_common.h +++ b/drivers/staging/otus/athr_common.h @@ -68,7 +68,7 @@ #define ZM_WAPI_KEY_SIZE 32 #define ZM_WAPI_IV_LEN 16 -#endif //ZM_ENALBE_WAPI +#endif /* ZM_ENALBE_WAPI */ /* structure definition */ struct athr_wlan_param { @@ -123,7 +123,7 @@ struct athr_wapi_param { u8 key[ZM_WAPI_KEY_SIZE]; } crypt; struct { - u8 wapi_policy; + u8 wapi_policy; } info; } u; }; @@ -132,10 +132,10 @@ struct athr_wapi_sta_info { u16 msg_type; u16 datalen; - u8 sta_mac[ETH_ALEN]; + u8 sta_mac[ETH_ALEN]; u8 reserve_data[2]; - u8 gsn[ZM_WAPI_IV_LEN]; + u8 gsn[ZM_WAPI_IV_LEN]; u8 wie[256]; }; -#endif //ZM_ENALBE_WAPI +#endif /* ZM_ENALBE_WAPI */ #endif |