signals: consolidate checks for whether or not to ignore a signal

[deliverable/linux.git] / drivers / net / ucc_geth.h

diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h
index aaeb9487798750469e1ea85271cc025559326d8e..9f8b7580a3a4578ddf6ed205279ccd7ecf1f5b4e 100644 (file)
--- a/drivers/net/ucc_geth.h
+++ b/drivers/net/ucc_geth.h
@@ -44,6 +44,7 @@
 
 struct ucc_geth {
        struct ucc_fast uccf;
+       u8 res0[0x100 - sizeof(struct ucc_fast)];
 
        u32 maccfg1;            /* mac configuration reg. 1 */
        u32 maccfg2;            /* mac configuration reg. 2 */
@@ -1155,7 +1156,7 @@ struct ucc_geth_info {
        u16 pausePeriod;
        u16 extensionField;
        u8 phy_address;
-       u32 mdio_bus;
+       char mdio_bus[MII_BUS_ID_SIZE];
        u8 weightfactor[NUM_TX_QUEUES];
        u8 interruptcoalescingmaxvalue[NUM_RX_QUEUES];
        u8 l2qt[UCC_GETH_VLAN_PRIORITY_MAX];