Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...
[safe/jmp/linux-2.6] / drivers / net / ps3_gelic_net.c
index 31c3092..055af08 100644 (file)
@@ -58,11 +58,11 @@ static inline struct device *ctodev(struct gelic_net_card *card)
 {
        return &card->dev->core;
 }
-static inline unsigned int bus_id(struct gelic_net_card *card)
+static inline u64 bus_id(struct gelic_net_card *card)
 {
        return card->dev->bus_id;
 }
-static inline unsigned int dev_id(struct gelic_net_card *card)
+static inline u64 dev_id(struct gelic_net_card *card)
 {
        return card->dev->dev_id;
 }
@@ -716,25 +716,17 @@ static int gelic_net_kick_txdma(struct gelic_net_card *card,
                                struct gelic_net_descr *descr)
 {
        int status = 0;
-       int count = 10;
 
        if (card->tx_dma_progress)
                return 0;
 
        if (gelic_net_get_descr_status(descr) == GELIC_NET_DESCR_CARDOWNED) {
                card->tx_dma_progress = 1;
-               /* sometimes we need retry here */
-               while (count--) {
-                       status = lv1_net_start_tx_dma(bus_id(card),
-                                                     dev_id(card),
-                                                     descr->bus_addr, 0);
-                       if (!status)
-                               break;
-               }
-               if (!count)
+               status = lv1_net_start_tx_dma(bus_id(card), dev_id(card),
+                                             descr->bus_addr, 0);
+               if (status)
                        dev_info(ctodev(card), "lv1_net_start_txdma failed," \
-                               "status=%d %#lx\n",
-                                status, card->irq_status);
+                                "status=%d\n", status);
        }
        return status;
 }
@@ -1356,8 +1348,8 @@ static int gelic_net_setup_netdev(struct gelic_net_card *card)
        unsigned int i;
        int status;
        u64 v1, v2;
+       DECLARE_MAC_BUF(mac);
 
-       SET_MODULE_OWNER(netdev);
        SET_NETDEV_DEV(netdev, &card->dev->core);
        spin_lock_init(&card->tx_dma_lock);
 
@@ -1382,10 +1374,8 @@ static int gelic_net_setup_netdev(struct gelic_net_card *card)
        v1 <<= 16;
        memcpy(addr.sa_data, &v1, ETH_ALEN);
        memcpy(netdev->dev_addr, addr.sa_data, ETH_ALEN);
-       dev_info(ctodev(card), "MAC addr %02x:%02x:%02x:%02x:%02x:%02x\n",
-                netdev->dev_addr[0], netdev->dev_addr[1],
-                netdev->dev_addr[2], netdev->dev_addr[3],
-                netdev->dev_addr[4], netdev->dev_addr[5]);
+       dev_info(ctodev(card), "MAC addr %s\n",
+                print_mac(mac, netdev->dev_addr));
 
        card->vlan_index = -1;  /* no vlan */
        for (i = 0; i < GELIC_NET_VLAN_MAX; i++) {