libertas: simplify and clean up association/start/join setup

Some of the parameters for association/join/start commands aren't
used (like the FH and CF IEs for IBSS, and the FH IE for BSS), so
get rid of their unions to reduce indirection.  Also clean up
structure names for kernel style.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index a4455ec7c354..d0de8c70f8c9 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -340,7 +340,7 @@ struct bss_descriptor {
         u32 rssi;
         u32 channel;
         u16 beaconperiod;
-        u32 atimwindow;
+        __le16 atimwindow;
 
         /* IW_MODE_AUTO, IW_MODE_ADHOC, IW_MODE_INFRA */
         u8 mode;
@@ -350,8 +350,8 @@ struct bss_descriptor {
 
         unsigned long last_scanned;
 
-        union ieeetypes_phyparamset phyparamset;
-        union IEEEtypes_ssparamset ssparamset;
+        union ieee_phy_param_set phy;
+        union ieee_ss_param_set ss;
 
         struct ieeetypes_countryinfofullset countryinfo;