Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-drm-fsl-dcu.git] / net / atm / mpc.h

diff --git a/net/atm/mpc.h b/net/atm/mpc.h
index 51f460d005c306a5053a887278e8480e60e0d2af..24c386c35f5700442fcbee0134c6480daf8fa2a3 100644 (file)
--- a/net/atm/mpc.h
+++ b/net/atm/mpc.h
@@ -12,32 +12,32 @@
 int msg_to_mpoad(struct k_message *msg, struct mpoa_client *mpc);
 
 struct mpoa_client {
-        struct mpoa_client *next;
-        struct net_device *dev;      /* lec in question                     */
-        int dev_num;                 /* e.g. 2 for lec2                     */
-        int (*old_hard_start_xmit)(struct sk_buff *skb, struct net_device *dev);
-        struct atm_vcc *mpoad_vcc;   /* control channel to mpoad            */
-        uint8_t mps_ctrl_addr[ATM_ESA_LEN];  /* MPS control ATM address     */
-        uint8_t our_ctrl_addr[ATM_ESA_LEN];  /* MPC's control ATM address   */
-
-        rwlock_t ingress_lock;
-        struct in_cache_ops *in_ops; /* ingress cache operations            */
-        in_cache_entry *in_cache;    /* the ingress cache of this MPC       */
-
-        rwlock_t egress_lock;
-        struct eg_cache_ops *eg_ops; /* egress cache operations             */
-        eg_cache_entry *eg_cache;    /* the egress  cache of this MPC       */
-
-        uint8_t *mps_macs;           /* array of MPS MAC addresses, >=1     */
-        int number_of_mps_macs;      /* number of the above MAC addresses   */
-        struct mpc_parameters parameters;  /* parameters for this client    */
+       struct mpoa_client *next;
+       struct net_device *dev;      /* lec in question                     */
+       int dev_num;                 /* e.g. 2 for lec2                     */
+       int (*old_hard_start_xmit)(struct sk_buff *skb, struct net_device *dev);
+       struct atm_vcc *mpoad_vcc;   /* control channel to mpoad            */
+       uint8_t mps_ctrl_addr[ATM_ESA_LEN];  /* MPS control ATM address     */
+       uint8_t our_ctrl_addr[ATM_ESA_LEN];  /* MPC's control ATM address   */
+
+       rwlock_t ingress_lock;
+       struct in_cache_ops *in_ops; /* ingress cache operations            */
+       in_cache_entry *in_cache;    /* the ingress cache of this MPC       */
+
+       rwlock_t egress_lock;
+       struct eg_cache_ops *eg_ops; /* egress cache operations             */
+       eg_cache_entry *eg_cache;    /* the egress  cache of this MPC       */
+
+       uint8_t *mps_macs;           /* array of MPS MAC addresses, >=1     */
+       int number_of_mps_macs;      /* number of the above MAC addresses   */
+       struct mpc_parameters parameters;  /* parameters for this client    */
 };
 
 
 struct atm_mpoa_qos {
-        struct atm_mpoa_qos *next;
-        __be32 ipaddr;
-        struct atm_qos qos;
+       struct atm_mpoa_qos *next;
+       __be32 ipaddr;
+       struct atm_qos qos;
 };