aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/jme.c
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2010-11-24 13:30:28 -0500
committerChris Metcalf <cmetcalf@tilera.com>2010-11-24 13:30:28 -0500
commitb03a6c4c7d8ebd8118d668eafdb85f5f76b5437f (patch)
treef6ca7059e9c1bc1aac9a6741316f8e07ba349f7f /drivers/net/jme.c
parent24f3f6b5eff92608a62449e33bfac0eed1447d02 (diff)
parent3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff)
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/net/jme.c')
-rw-r--r--drivers/net/jme.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index d85edf3119c2..c57d9a43ceca 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -2955,11 +2955,7 @@ jme_init_one(struct pci_dev *pdev,
2955 * Tell stack that we are not ready to work until open() 2955 * Tell stack that we are not ready to work until open()
2956 */ 2956 */
2957 netif_carrier_off(netdev); 2957 netif_carrier_off(netdev);
2958 netif_stop_queue(netdev);
2959 2958
2960 /*
2961 * Register netdev
2962 */
2963 rc = register_netdev(netdev); 2959 rc = register_netdev(netdev);
2964 if (rc) { 2960 if (rc) {
2965 pr_err("Cannot register net device\n"); 2961 pr_err("Cannot register net device\n");