Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6

[pandora-kernel.git] / drivers / net / davinci_emac.c

diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index dcc4a17..acef7e9 100644 (file)
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -48,7 +48,6 @@
 #include <linux/highmem.h>
 #include <linux/proc_fs.h>
 #include <linux/ctype.h>
-#include <linux/version.h>
 #include <linux/spinlock.h>
 #include <linux/dma-mapping.h>
 #include <linux/clk.h>
@@ -1083,6 +1082,8 @@ static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev)
                goto fail_tx;
        }
 
+       skb_tx_timestamp(skb);
+
        ret_code = cpdma_chan_submit(priv->txchan, skb, skb->data, skb->len,
                                     GFP_KERNEL);
        if (unlikely(ret_code != 0)) {
@@ -1489,14 +1490,14 @@ static void emac_adjust_link(struct net_device *ndev)
  */
 static int emac_devioctl(struct net_device *ndev, struct ifreq *ifrq, int cmd)
 {
-       dev_warn(&ndev->dev, "DaVinci EMAC: ioctl not supported\n");
+       struct emac_priv *priv = netdev_priv(ndev);
 
        if (!(netif_running(ndev)))
                return -EINVAL;
 
        /* TODO: Add phy read and write and private statistics get feature */
 
-       return -EOPNOTSUPP;
+       return phy_mii_ioctl(priv->phydev, ifrq, cmd);
 }
 
 static int match_first_device(struct device *dev, void *data)