1 files changed, 48 insertions, 45 deletions

diff --git a/drivers/net/ethernet/freescale/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h
index 8b27e5ff54c0..1e2ce8bfea83 100644
--- a/drivers/net/ethernet/freescale/gianfar.h
+++ b/drivers/net/ethernet/freescale/gianfar.h
@@ -1049,28 +1049,64 @@ enum gfar_errata {
  * the buffer descriptor determines the actual condition.
  */
 struct gfar_private {
-
-        /* Indicates how many tx, rx queues are enabled */
-        unsigned int num_tx_queues;
         unsigned int num_rx_queues;
-        unsigned int num_grps;
-        unsigned int mode;
-
-        /* The total tx and rx ring size for the enabled queues */
-        unsigned int total_tx_ring_size;
-        unsigned int total_rx_ring_size;
 
         struct device *dev;
         struct net_device *ndev;
-        struct platform_device *ofdev;
         enum gfar_errata errata;
+        unsigned int rx_buffer_size;
+
+        u16 padding;
+
+        /* HW time stamping enabled flag */
+        int hwts_rx_en;
+        int hwts_tx_en;
 
-        struct gfar_priv_grp gfargrp[MAXGROUPS];
         struct gfar_priv_tx_q *tx_queue[MAX_TX_QS];
         struct gfar_priv_rx_q *rx_queue[MAX_RX_QS];
+        struct gfar_priv_grp gfargrp[MAXGROUPS];
+
+        u32 device_flags;
+
+        unsigned int mode;
+        unsigned int num_tx_queues;
+        unsigned int num_grps;
+
+        /* Network Statistics */
+        struct gfar_extra_stats extra_stats;
+
+        /* PHY stuff */
+        phy_interface_t interface;
+        struct device_node *phy_node;
+        struct device_node *tbi_node;
+        struct phy_device *phydev;
+        struct mii_bus *mii_bus;
+        int oldspeed;
+        int oldduplex;
+        int oldlink;
+
+        /* Bitfield update lock */
+        spinlock_t bflock;
+
+        uint32_t msg_enable;
+
+        struct work_struct reset_task;
+
+        struct platform_device *ofdev;
+        unsigned char
+                extended_hash:1,
+                bd_stash_en:1,
+                rx_filer_enable:1,
+                /* Wake-on-LAN enabled */
+                wol_en:1,
+                /* Enable priorty based Tx scheduling in Hw */
+                prio_sched_en:1;
+
+        /* The total tx and rx ring size for the enabled queues */
+        unsigned int total_tx_ring_size;
+        unsigned int total_rx_ring_size;
 
         /* RX per device parameters */
-        unsigned int rx_buffer_size;
         unsigned int rx_stash_size;
         unsigned int rx_stash_index;
 
@@ -1089,39 +1125,6 @@ struct gfar_private {
         unsigned int fifo_starve;
         unsigned int fifo_starve_off;
 
-        /* Bitfield update lock */
-        spinlock_t bflock;
-
-        phy_interface_t interface;
-        struct device_node *phy_node;
-        struct device_node *tbi_node;
-        u32 device_flags;
-        unsigned char
-                extended_hash:1,
-                bd_stash_en:1,
-                rx_filer_enable:1,
-                wol_en:1, /* Wake-on-LAN enabled */
-                prio_sched_en:1; /* Enable priorty based Tx scheduling in Hw */
-        unsigned short padding;
-
-        /* PHY stuff */
-        struct phy_device *phydev;
-        struct mii_bus *mii_bus;
-        int oldspeed;
-        int oldduplex;
-        int oldlink;
-
-        uint32_t msg_enable;
-
-        struct work_struct reset_task;
-
-        /* Network Statistics */
-        struct gfar_extra_stats extra_stats;
-
-        /* HW time stamping enabled flag */
-        int hwts_rx_en;
-        int hwts_tx_en;
-
         /*Filer table*/
         unsigned int ftp_rqfpr[MAX_FILER_IDX + 1];
         unsigned int ftp_rqfcr[MAX_FILER_IDX + 1];