Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 12 insertions, 11 deletions

diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 8d97f168f018..dfeb006035df 100644
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -302,7 +302,7 @@ struct eepro_local {
 #define ee_id_eepro10p0 0x10   /* ID for eepro/10+ */
 #define ee_id_eepro10p1 0x31
 
-#define TX_TIMEOUT 40
+#define TX_TIMEOUT ((4*HZ)/10)
 
 /* Index to functions, as function prototypes. */
 
@@ -891,12 +891,13 @@ err:
    there is non-reboot way to recover if something goes wrong.
    */
 
-static char irqrmap[] = {-1,-1,0,1,-1,2,-1,-1,-1,0,3,4,-1,-1,-1,-1};
-static char irqrmap2[] = {-1,-1,4,0,1,2,-1,3,-1,4,5,6,7,-1,-1,-1};
+static const char irqrmap[] = {-1,-1,0,1,-1,2,-1,-1,-1,0,3,4,-1,-1,-1,-1};
+static const char irqrmap2[] = {-1,-1,4,0,1,2,-1,3,-1,4,5,6,7,-1,-1,-1};
 static int      eepro_grab_irq(struct net_device *dev)
 {
-        int irqlist[] = { 3, 4, 5, 7, 9, 10, 11, 12, 0 };
-        int *irqp = irqlist, temp_reg, ioaddr = dev->base_addr;
+        static const int irqlist[] = { 3, 4, 5, 7, 9, 10, 11, 12, 0 };
+        const int *irqp = irqlist;
+        int temp_reg, ioaddr = dev->base_addr;
 
         eepro_sw2bank1(ioaddr); /* be CAREFUL, BANK 1 now */
 
@@ -1457,11 +1458,11 @@ hardware_send_packet(struct net_device *dev, void *buf, short length)
         if (net_debug > 5)
                 printk(KERN_DEBUG "%s: entering hardware_send_packet routine.\n", dev->name);
 
-                /* determine how much of the transmit buffer space is available */
-                if (lp->tx_end > lp->tx_start)
+        /* determine how much of the transmit buffer space is available */
+        if (lp->tx_end > lp->tx_start)
                 tx_available = lp->xmt_ram - (lp->tx_end - lp->tx_start);
-                else if (lp->tx_end < lp->tx_start)
-                        tx_available = lp->tx_start - lp->tx_end;
+        else if (lp->tx_end < lp->tx_start)
+                tx_available = lp->tx_start - lp->tx_end;
         else tx_available = lp->xmt_ram;
 
         if (((((length + 3) >> 1) << 1) + 2*XMT_HEADER) >= tx_available) {
@@ -1702,7 +1703,7 @@ static int eepro_ethtool_get_settings(struct net_device *dev,
                 cmd->advertising |= ADVERTISED_AUI;
         }
 
-        cmd->speed = SPEED_10;
+        ethtool_cmd_speed_set(cmd, SPEED_10);
 
         if (dev->if_port == TPE && lp->word[1] & ee_Duplex) {
                 cmd->duplex = DUPLEX_FULL;
@@ -1760,7 +1761,7 @@ module_param_array(io, int, NULL, 0);
 module_param_array(irq, int, NULL, 0);
 module_param_array(mem, int, NULL, 0);
 module_param(autodetect, int, 0);
-MODULE_PARM_DESC(io, "EtherExpress Pro/10 I/O base addres(es)");
+MODULE_PARM_DESC(io, "EtherExpress Pro/10 I/O base address(es)");
 MODULE_PARM_DESC(irq, "EtherExpress Pro/10 IRQ number(s)");
 MODULE_PARM_DESC(mem, "EtherExpress Pro/10 Rx buffer size(es) in kB (3-29)");
 MODULE_PARM_DESC(autodetect, "EtherExpress Pro/10 force board(s) detection (0-1)");