Commit cc5dc29c authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman

Staging: et131x: clean up MAX_FM type

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c9835d97
...@@ -1377,20 +1377,8 @@ typedef struct _RXMAC_t { /* Location: */ ...@@ -1377,20 +1377,8 @@ typedef struct _RXMAC_t { /* Location: */
/* /*
* structure for Maximum Frame Length reg in mac address map. * 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. * structure for Reserve 1 reg in mac address map.
...@@ -1652,7 +1640,7 @@ typedef struct _MAC_t { /* Location: */ ...@@ -1652,7 +1640,7 @@ typedef struct _MAC_t { /* Location: */
u32 cfg2; /* 0x5004 */ u32 cfg2; /* 0x5004 */
u32 ipg; /* 0x5008 */ u32 ipg; /* 0x5008 */
u32 hfdp; /* 0x500C */ u32 hfdp; /* 0x500C */
MAC_MAX_FM_LEN_t max_fm_len; /* 0x5010 */ u32 max_fm_len; /* 0x5010 */
u32 rsv1; /* 0x5014 */ u32 rsv1; /* 0x5014 */
u32 rsv2; /* 0x5018 */ u32 rsv2; /* 0x5018 */
MAC_TEST_t mac_test; /* 0x501C */ MAC_TEST_t mac_test; /* 0x501C */
......
...@@ -146,7 +146,7 @@ void ConfigMACRegs1(struct et131x_adapter *etdev) ...@@ -146,7 +146,7 @@ void ConfigMACRegs1(struct et131x_adapter *etdev)
* Packets larger than (RegistryJumboPacket) that do not contain a * Packets larger than (RegistryJumboPacket) that do not contain a
* VLAN ID will be dropped by the Rx function. * 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 */ /* clear out MAC config reset */
writel(0, &pMac->cfg1); writel(0, &pMac->cfg1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment