projects
/
openwrt-10.03
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: merge latest ag71xx changes from trunk, fix wrong argument to phy_mii_ioctl()
[openwrt-10.03/.git]
/
target
/
linux
/
ar71xx
/
files
/
drivers
/
net
/
ag71xx
/
ag71xx_main.c
diff --git
a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
index eae443e8ceea8ff84ea35f7201870e04a8a28908..0eb5ce15bd49319366ac9281717ce3310539d022 100644
(file)
--- a/
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@
-652,6
+652,7
@@
static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
DMA_TO_DEVICE);
ring->buf[i].skb = skb;
DMA_TO_DEVICE);
ring->buf[i].skb = skb;
+ ring->buf[i].timestamp = jiffies;
/* setup descriptor fields */
desc->data = (u32) dma_addr;
/* setup descriptor fields */
desc->data = (u32) dma_addr;
@@
-713,7
+714,7
@@
static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
if (ag->phy_dev == NULL)
break;
if (ag->phy_dev == NULL)
break;
- return phy_mii_ioctl(ag->phy_dev, if
r
, cmd);
+ return phy_mii_ioctl(ag->phy_dev, if
_mii(ifr)
, cmd);
default:
break;
default:
break;