projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ni5010.c
diff --git
a/drivers/net/ni5010.c
b/drivers/net/ni5010.c
index 3892330f244a0e65b6a96bf3be8e2b72236f6e79..4d3f2e2b28bd2f6a6f9f3c1bcba4e7e1467c5d14 100644
(file)
--- a/
drivers/net/ni5010.c
+++ b/
drivers/net/ni5010.c
@@
-444,7
+444,7
@@
static void ni5010_timeout(struct net_device *dev)
/* Try to restart the adaptor. */
/* FIXME: Give it a real kick here */
chipset_init(dev, 1);
/* Try to restart the adaptor. */
/* FIXME: Give it a real kick here */
chipset_init(dev, 1);
- dev->trans_start = jiffies;
+ dev->trans_start = jiffies;
/* prevent tx timeout */
netif_wake_queue(dev);
}
netif_wake_queue(dev);
}
@@
-460,7
+460,6
@@
static int ni5010_send_packet(struct sk_buff *skb, struct net_device *dev)
netif_stop_queue(dev);
hardware_send_packet(dev, (unsigned char *)skb->data, skb->len, length-skb->len);
netif_stop_queue(dev);
hardware_send_packet(dev, (unsigned char *)skb->data, skb->len, length-skb->len);
- dev->trans_start = jiffies;
dev_kfree_skb (skb);
return NETDEV_TX_OK;
}
dev_kfree_skb (skb);
return NETDEV_TX_OK;
}
@@
-515,8
+514,6
@@
static void dump_packet(void *buf, int len)
if (i % 16 == 15) printk("\n");
}
printk("\n");
if (i % 16 == 15) printk("\n");
}
printk("\n");
-
- return;
}
/* We have a good packet, get it out of the buffer. */
}
/* We have a good packet, get it out of the buffer. */