Staging: et131x: clean up MAX_FM type

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/et131x/et1310_address_map.h b/drivers/staging/et131x/et1310_address_map.h
index 5a7d9ccf165951a2873d19650856f069a1a5dc16..ab111a3456d14ee3039cad99f92d8bbd311e8f22 100644 (file)
--- a/drivers/staging/et131x/et1310_address_map.h
+++ b/drivers/staging/et131x/et1310_address_map.h
@@ -1377,20 +1377,8 @@ typedef struct _RXMAC_t {                                /* Location: */
 
 /*
  * structure for Maximum Frame Length reg in mac address map.
- * located at address 0x5010
+ * located at address 0x5010: bits 0-15 hold the length.
  */
-typedef union _MAC_MAX_FM_LEN_t {
-       u32 value;
-       struct {
-#ifdef _BIT_FIELDS_HTOL
-               u32 reserved:16;        /* bits 16-31 */
-               u32 max_len:16; /* bits 0-15 */
-#else
-               u32 max_len:16; /* bits 0-15 */
-               u32 reserved:16;        /* bits 16-31 */
-#endif
-       } bits;
-} MAC_MAX_FM_LEN_t, *PMAC_MAX_FM_LEN_t;
 
 /*
  * structure for Reserve 1 reg in mac address map.
@@ -1652,7 +1640,7 @@ typedef struct _MAC_t {                                   /* Location: */
        u32 cfg2;                                       /*  0x5004 */
        u32 ipg;                                        /*  0x5008 */
        u32 hfdp;                                       /*  0x500C */
-       MAC_MAX_FM_LEN_t max_fm_len;                    /*  0x5010 */
+       u32 max_fm_len;                                 /*  0x5010 */
        u32 rsv1;                                       /*  0x5014 */
        u32 rsv2;                                       /*  0x5018 */
        MAC_TEST_t mac_test;                            /*  0x501C */

diff --git a/drivers/staging/et131x/et1310_mac.c b/drivers/staging/et131x/et1310_mac.c
index ad32a13a3b32ffaebff2833b8073b127cfa7ba09..ae7cee43a165672964a861ee0397b68f1acd1acc 100644 (file)
--- a/drivers/staging/et131x/et1310_mac.c
+++ b/drivers/staging/et131x/et1310_mac.c
@@ -146,7 +146,7 @@ void ConfigMACRegs1(struct et131x_adapter *etdev)
         * Packets larger than (RegistryJumboPacket) that do not contain a
         * VLAN ID will be dropped by the Rx function.
         */
-       writel(etdev->RegistryJumboPacket + 4, &pMac->max_fm_len.value);
+       writel(etdev->RegistryJumboPacket + 4, &pMac->max_fm_len);
 
        /* clear out MAC config reset */
        writel(0, &pMac->cfg1);