net: congestion notifications are not dropped packets

[safe/jmp/linux-2.6] / drivers / net / mac8390.c

diff --git a/drivers/net/mac8390.c b/drivers/net/mac8390.c
index c70bd68..1136c9a 100644 (file)
--- a/drivers/net/mac8390.c
+++ b/drivers/net/mac8390.c
@@ -28,7 +28,6 @@
 #include <linux/ioport.h>
 #include <linux/nubus.h>
 #include <linux/in.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -303,7 +302,7 @@ static bool __init mac8390_init(struct net_device *dev, struct nubus_dev *ndev,
        int offset;
        volatile unsigned short *i;
 
-       printk_once(KERN_INFO pr_fmt(version));
+       printk_once(KERN_INFO pr_fmt("%s"), version);
 
        dev->irq = SLOT2IRQ(ndev->board->slot);
        /* This is getting to be a habit */
@@ -662,7 +661,6 @@ static void mac8390_no_reset(struct net_device *dev)
        ei_status.txing = 0;
        if (ei_debug > 1)
                pr_info("reset not supported\n");
-       return;
 }
 
 static void interlan_reset(struct net_device *dev)
@@ -674,7 +672,6 @@ static void interlan_reset(struct net_device *dev)
        target[0xC0000] = 0;
        if (ei_debug > 1)
                pr_cont("reset complete\n");
-       return;
 }
 
 /* dayna_memcpy_fromio/dayna_memcpy_toio */