jme: Remove 64 and 40 bit dma_mask

[linux-2.6-omap-h63xx.git] / drivers / net / e100.c

diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 5894716de19f924a279e4ca37e54e0b785c2c005..dce7ff28c3ff4087b56ada70aff23ec29f90866d 100644 (file)
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1580,11 +1580,13 @@ static void e100_watchdog(unsigned long data)
        mii_ethtool_gset(&nic->mii, &cmd);
 
        if(mii_link_ok(&nic->mii) && !netif_carrier_ok(nic->netdev)) {
-               DPRINTK(LINK, INFO, "link up, %sMbps, %s-duplex\n",
-                       cmd.speed == SPEED_100 ? "100" : "10",
-                       cmd.duplex == DUPLEX_FULL ? "full" : "half");
+               printk(KERN_INFO "e100: %s NIC Link is Up %s Mbps %s Duplex\n",
+                      nic->netdev->name,
+                      cmd.speed == SPEED_100 ? "100" : "10",
+                      cmd.duplex == DUPLEX_FULL ? "Full" : "Half");
        } else if(!mii_link_ok(&nic->mii) && netif_carrier_ok(nic->netdev)) {
-               DPRINTK(LINK, INFO, "link down\n");
+               printk(KERN_INFO "e100: %s NIC Link is Down\n",
+                      nic->netdev->name);
        }
 
        mii_check_link(&nic->mii);
@@ -2615,6 +2617,7 @@ static int e100_close(struct net_device *netdev)
 static const struct net_device_ops e100_netdev_ops = {
        .ndo_open               = e100_open,
        .ndo_stop               = e100_close,
+       .ndo_start_xmit         = e100_xmit_frame,
        .ndo_validate_addr      = eth_validate_addr,
        .ndo_set_multicast_list = e100_set_multicast_list,
        .ndo_set_mac_address    = e100_set_mac_address,
@@ -2640,7 +2643,6 @@ static int __devinit e100_probe(struct pci_dev *pdev,
        }
 
        netdev->netdev_ops = &e100_netdev_ops;
-       netdev->hard_start_xmit = e100_xmit_frame;
        SET_ETHTOOL_OPS(netdev, &e100_ethtool_ops);
        netdev->watchdog_timeo = E100_WATCHDOG_PERIOD;
        strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);