rt2x00: Move start() and stop() handlers into rt2x00lib.c

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

diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 3bbcea1..2fe14b0 100644 (file)
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -1319,6 +1319,7 @@ static int link_status_10g(struct niu *np, int *link_up_p)
 
 static int link_status_1g(struct niu *np, int *link_up_p)
 {
+       struct niu_link_config *lp = &np->link_config;
        u16 current_speed, bmsr;
        unsigned long flags;
        u8 current_duplex;
@@ -1386,6 +1387,8 @@ static int link_status_1g(struct niu *np, int *link_up_p)
                                link_up = 0;
                }
        }
+       lp->active_speed = current_speed;
+       lp->active_duplex = current_duplex;
        err = 0;
 
 out:
@@ -7585,12 +7588,10 @@ static void __devinit niu_assign_netdev_ops(struct net_device *dev)
 static void __devinit niu_device_announce(struct niu *np)
 {
        struct net_device *dev = np->dev;
-       int i;
+       DECLARE_MAC_BUF(mac);
 
-       pr_info("%s: NIU Ethernet ", dev->name);
-       for (i = 0; i < 6; i++)
-               printk("%2.2x%c", dev->dev_addr[i],
-                      i == 5 ? '\n' : ':');
+       pr_info("%s: NIU Ethernet %s\n",
+               dev->name, print_mac(mac, dev->dev_addr));
 
        pr_info("%s: Port type[%s] mode[%s:%s] XCVR[%s] phy[%s]\n",
                dev->name,