Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

3 files changed, 52 insertions, 18 deletions

diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h
index a15cdd4a8e58..12078577aef6 100644
--- a/include/linux/mv643xx_eth.h
+++ b/include/linux/mv643xx_eth.h
@@ -17,30 +17,59 @@
 
 struct mv643xx_eth_shared_platform_data {
         struct mbus_dram_target_info    *dram;
-        unsigned int    t_clk;
+        unsigned int            t_clk;
 };
 
 struct mv643xx_eth_platform_data {
+        /*
+         * Pointer back to our parent instance, and our port number.
+         */
         struct platform_device  *shared;
-        int             port_number;
+        int                     port_number;
 
+        /*
+         * Whether a PHY is present, and if yes, at which address.
+         */
         struct platform_device  *shared_smi;
+        int                     force_phy_addr;
+        int                     phy_addr;
 
-        u16             force_phy_addr; /* force override if phy_addr == 0 */
-        u16             phy_addr;
-
-        /* If speed is 0, then speed and duplex are autonegotiated. */
-        int             speed;          /* 0, SPEED_10, SPEED_100, SPEED_1000 */
-        int             duplex;         /* DUPLEX_HALF or DUPLEX_FULL */
-
-        /* non-zero values of the following fields override defaults */
-        u32             tx_queue_size;
-        u32             rx_queue_size;
-        u32             tx_sram_addr;
-        u32             tx_sram_size;
-        u32             rx_sram_addr;
-        u32             rx_sram_size;
-        u8              mac_addr[6];    /* mac address if non-zero*/
+        /*
+         * Use this MAC address if it is valid, overriding the
+         * address that is already in the hardware.
+         */
+        u8                      mac_addr[6];
+
+        /*
+         * If speed is 0, autonegotiation is enabled.
+         *   Valid values for speed: 0, SPEED_10, SPEED_100, SPEED_1000.
+         *   Valid values for duplex: DUPLEX_HALF, DUPLEX_FULL.
+         */
+        int                     speed;
+        int                     duplex;
+
+        /*
+         * Which RX/TX queues to use.
+         */
+        int                     rx_queue_mask;
+        int                     tx_queue_mask;
+
+        /*
+         * Override default RX/TX queue sizes if nonzero.
+         */
+        int                     rx_queue_size;
+        int                     tx_queue_size;
+
+        /*
+         * Use on-chip SRAM for RX/TX descriptors if size is nonzero
+         * and sufficient to contain all descriptors for the requested
+         * ring sizes.
+         */
+        unsigned long           rx_sram_addr;
+        int                     rx_sram_size;
+        unsigned long           tx_sram_addr;
+        int                     tx_sram_size;
 };
 
-#endif /* __LINUX_MV643XX_ETH_H */
+
+#endif
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 06d8ea5992df..4bf613cd9e2d 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1479,6 +1479,7 @@ extern void		__dev_addr_unsync(struct dev_addr_list **to, int *to_count, struct
 extern void             dev_set_promiscuity(struct net_device *dev, int inc);
 extern void             dev_set_allmulti(struct net_device *dev, int inc);
 extern void             netdev_state_change(struct net_device *dev);
+extern void             netdev_bonding_change(struct net_device *dev);
 extern void             netdev_features_change(struct net_device *dev);
 /* Load a device via the kmod */
 extern void             dev_load(struct net *net, const char *name);
@@ -1505,6 +1506,9 @@ extern void *dev_seq_next(struct seq_file *seq, void *v, loff_t *pos);
 extern void dev_seq_stop(struct seq_file *seq, void *v);
 #endif
 
+extern int netdev_class_create_file(struct class_attribute *class_attr);
+extern void netdev_class_remove_file(struct class_attribute *class_attr);
+
 extern void linkwatch_run_queue(void);
 
 extern int netdev_compute_features(unsigned long all, unsigned long one);
diff --git a/include/linux/notifier.h b/include/linux/notifier.h
index 0ff6224d172a..bd3d72ddf333 100644
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
@@ -197,6 +197,7 @@ static inline int notifier_to_errno(int ret)
 #define NETDEV_GOING_DOWN       0x0009
 #define NETDEV_CHANGENAME       0x000A
 #define NETDEV_FEAT_CHANGE      0x000B
+#define NETDEV_BONDING_FAILOVER 0x000C
 
 #define SYS_DOWN        0x0001  /* Notify of system down */
 #define SYS_RESTART     SYS_DOWN