fbdev: section cleanup in w100fb

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

diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index 55ee055..3c58db5 100644 (file)
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -56,7 +56,7 @@ module_param(dumb_switch, int, 0444);
 MODULE_PARM_DESC(debug_level, "Number of NETIF_MSG bits to enable");
 MODULE_PARM_DESC(dumb_switch, "Assume switch is not connected to MDIO bus");
 
-#define CPMAC_VERSION "0.5.1"
+#define CPMAC_VERSION "0.5.2"
 /* frame size + 802.1q tag + FCS size */
 #define CPMAC_SKB_SIZE         (ETH_FRAME_LEN + ETH_FCS_LEN + VLAN_HLEN)
 #define CPMAC_QUEUES   8
@@ -328,7 +328,7 @@ static int cpmac_config(struct net_device *dev, struct ifmap *map)
 
 static void cpmac_set_multicast_list(struct net_device *dev)
 {
-       struct dev_mc_list *iter;
+       struct netdev_hw_addr *ha;
        u8 tmp;
        u32 mbp, bit, hash[2] = { 0, };
        struct cpmac_priv *priv = netdev_priv(dev);
@@ -348,19 +348,19 @@ static void cpmac_set_multicast_list(struct net_device *dev)
                         * cpmac uses some strange mac address hashing
                         * (not crc32)
                         */
-                       netdev_for_each_mc_addr(iter, dev) {
+                       netdev_for_each_mc_addr(ha, dev) {
                                bit = 0;
-                               tmp = iter->dmi_addr[0];
+                               tmp = ha->addr[0];
                                bit  ^= (tmp >> 2) ^ (tmp << 4);
-                               tmp = iter->dmi_addr[1];
+                               tmp = ha->addr[1];
                                bit  ^= (tmp >> 4) ^ (tmp << 2);
-                               tmp = iter->dmi_addr[2];
+                               tmp = ha->addr[2];
                                bit  ^= (tmp >> 6) ^ tmp;
-                               tmp = iter->dmi_addr[3];
+                               tmp = ha->addr[3];
                                bit  ^= (tmp >> 2) ^ (tmp << 4);
-                               tmp = iter->dmi_addr[4];
+                               tmp = ha->addr[4];
                                bit  ^= (tmp >> 4) ^ (tmp << 2);
-                               tmp = iter->dmi_addr[5];
+                               tmp = ha->addr[5];
                                bit  ^= (tmp >> 6) ^ tmp;
                                bit &= 0x3f;
                                hash[bit / 32] |= 1 << (bit % 32);
@@ -579,7 +579,6 @@ static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
        }
 
        spin_lock(&priv->lock);
-       dev->trans_start = jiffies;
        spin_unlock(&priv->lock);
        desc->dataflags = CPMAC_SOP | CPMAC_EOP | CPMAC_OWN;
        desc->skb = skb;
@@ -1137,8 +1136,9 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
        }
 
        if (phy_id == PHY_MAX_ADDR) {
-               dev_err(&pdev->dev, "no PHY present\n");
-               return -ENODEV;
+               dev_err(&pdev->dev, "no PHY present, falling back to switch on MDIO bus 0\n");
+               strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */
+               phy_id = pdev->id;
        }
 
        dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES);