aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-23 20:56:23 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-23 20:56:23 -0500
commit6332178d91ca1a9dbd99bd97cabbcf965d178e9f (patch)
treed98af2cbc7ff0e9e4d00b6cc8c79b05ca7815a5f /drivers
parent908a7a16b852ffd618a9127be8d62432182d81b4 (diff)
parent739840d529eb7505d3cbfe9d468bf1440c9a8e27 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/ppp_generic.c
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/bnx2.c6
-rw-r--r--drivers/net/jme.h2
-rw-r--r--drivers/net/phy/mdio_bus.c5
-rw-r--r--drivers/net/ppp_generic.c28
-rw-r--r--drivers/net/starfire.c5
5 files changed, 25 insertions, 21 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 33d69ddc90a3..d4a3dac21dcf 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -547,9 +547,9 @@ bnx2_free_rx_mem(struct bnx2 *bp)
547 for (j = 0; j < bp->rx_max_pg_ring; j++) { 547 for (j = 0; j < bp->rx_max_pg_ring; j++) {
548 if (rxr->rx_pg_desc_ring[j]) 548 if (rxr->rx_pg_desc_ring[j])
549 pci_free_consistent(bp->pdev, RXBD_RING_SIZE, 549 pci_free_consistent(bp->pdev, RXBD_RING_SIZE,
550 rxr->rx_pg_desc_ring[i], 550 rxr->rx_pg_desc_ring[j],
551 rxr->rx_pg_desc_mapping[i]); 551 rxr->rx_pg_desc_mapping[j]);
552 rxr->rx_pg_desc_ring[i] = NULL; 552 rxr->rx_pg_desc_ring[j] = NULL;
553 } 553 }
554 if (rxr->rx_pg_ring) 554 if (rxr->rx_pg_ring)
555 vfree(rxr->rx_pg_ring); 555 vfree(rxr->rx_pg_ring);
diff --git a/drivers/net/jme.h b/drivers/net/jme.h
index 2d6f30e638fc..5154411b5e6b 100644
--- a/drivers/net/jme.h
+++ b/drivers/net/jme.h
@@ -22,7 +22,7 @@
22 */ 22 */
23 23
24#ifndef __JME_H_INCLUDED__ 24#ifndef __JME_H_INCLUDED__
25#define __JME_H_INCLUDEE__ 25#define __JME_H_INCLUDED__
26 26
27#define DRV_NAME "jme" 27#define DRV_NAME "jme"
28#define DRV_VERSION "1.0.3" 28#define DRV_VERSION "1.0.3"
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 8755d8cd4166..7a333601fbe8 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -105,8 +105,6 @@ int mdiobus_register(struct mii_bus *bus)
105 return -EINVAL; 105 return -EINVAL;
106 } 106 }
107 107
108 bus->state = MDIOBUS_REGISTERED;
109
110 mutex_init(&bus->mdio_lock); 108 mutex_init(&bus->mdio_lock);
111 109
112 if (bus->reset) 110 if (bus->reset)
@@ -123,6 +121,9 @@ int mdiobus_register(struct mii_bus *bus)
123 } 121 }
124 } 122 }
125 123
124 if (!err)
125 bus->state = MDIOBUS_REGISTERED;
126
126 pr_info("%s: probed\n", bus->name); 127 pr_info("%s: probed\n", bus->name);
127 128
128 return err; 129 return err;
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index c832d600d1e8..06b448285eb5 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -117,6 +117,7 @@ struct ppp {
117 unsigned long last_xmit; /* jiffies when last pkt sent 9c */ 117 unsigned long last_xmit; /* jiffies when last pkt sent 9c */
118 unsigned long last_recv; /* jiffies when last pkt rcvd a0 */ 118 unsigned long last_recv; /* jiffies when last pkt rcvd a0 */
119 struct net_device *dev; /* network interface device a4 */ 119 struct net_device *dev; /* network interface device a4 */
120 int closing; /* is device closing down? a8 */
120#ifdef CONFIG_PPP_MULTILINK 121#ifdef CONFIG_PPP_MULTILINK
121 int nxchan; /* next channel to send something on */ 122 int nxchan; /* next channel to send something on */
122 u32 nxseq; /* next sequence number to send */ 123 u32 nxseq; /* next sequence number to send */
@@ -983,7 +984,7 @@ ppp_xmit_process(struct ppp *ppp)
983 struct sk_buff *skb; 984 struct sk_buff *skb;
984 985
985 ppp_xmit_lock(ppp); 986 ppp_xmit_lock(ppp);
986 if (ppp->dev) { 987 if (!ppp->closing) {
987 ppp_push(ppp); 988 ppp_push(ppp);
988 while (!ppp->xmit_pending 989 while (!ppp->xmit_pending
989 && (skb = skb_dequeue(&ppp->file.xq))) 990 && (skb = skb_dequeue(&ppp->file.xq)))
@@ -1451,8 +1452,7 @@ static inline void
1451ppp_do_recv(struct ppp *ppp, struct sk_buff *skb, struct channel *pch) 1452ppp_do_recv(struct ppp *ppp, struct sk_buff *skb, struct channel *pch)
1452{ 1453{
1453 ppp_recv_lock(ppp); 1454 ppp_recv_lock(ppp);
1454 /* ppp->dev == 0 means interface is closing down */ 1455 if (!ppp->closing)
1455 if (ppp->dev)
1456 ppp_receive_frame(ppp, skb, pch); 1456 ppp_receive_frame(ppp, skb, pch);
1457 else 1457 else
1458 kfree_skb(skb); 1458 kfree_skb(skb);
@@ -2484,18 +2484,16 @@ init_ppp_file(struct ppp_file *pf, int kind)
2484 */ 2484 */
2485static void ppp_shutdown_interface(struct ppp *ppp) 2485static void ppp_shutdown_interface(struct ppp *ppp)
2486{ 2486{
2487 struct net_device *dev;
2488
2489 mutex_lock(&all_ppp_mutex); 2487 mutex_lock(&all_ppp_mutex);
2490 ppp_lock(ppp);
2491 dev = ppp->dev;
2492 ppp->dev = NULL;
2493 ppp_unlock(ppp);
2494 /* This will call dev_close() for us. */ 2488 /* This will call dev_close() for us. */
2495 if (dev) { 2489 ppp_lock(ppp);
2496 unregister_netdev(dev); 2490 if (!ppp->closing) {
2497 free_netdev(dev); 2491 ppp->closing = 1;
2498 } 2492 ppp_unlock(ppp);
2493 unregister_netdev(ppp->dev);
2494 } else
2495 ppp_unlock(ppp);
2496
2499 unit_put(&ppp_units_idr, ppp->file.index); 2497 unit_put(&ppp_units_idr, ppp->file.index);
2500 ppp->file.dead = 1; 2498 ppp->file.dead = 1;
2501 ppp->owner = NULL; 2499 ppp->owner = NULL;
@@ -2540,7 +2538,7 @@ static void ppp_destroy_interface(struct ppp *ppp)
2540 if (ppp->xmit_pending) 2538 if (ppp->xmit_pending)
2541 kfree_skb(ppp->xmit_pending); 2539 kfree_skb(ppp->xmit_pending);
2542 2540
2543 kfree(ppp); 2541 free_netdev(ppp->dev);
2544} 2542}
2545 2543
2546/* 2544/*
@@ -2602,7 +2600,7 @@ ppp_connect_channel(struct channel *pch, int unit)
2602 if (pch->file.hdrlen > ppp->file.hdrlen) 2600 if (pch->file.hdrlen > ppp->file.hdrlen)
2603 ppp->file.hdrlen = pch->file.hdrlen; 2601 ppp->file.hdrlen = pch->file.hdrlen;
2604 hdrlen = pch->file.hdrlen + 2; /* for protocol bytes */ 2602 hdrlen = pch->file.hdrlen + 2; /* for protocol bytes */
2605 if (ppp->dev && hdrlen > ppp->dev->hard_header_len) 2603 if (hdrlen > ppp->dev->hard_header_len)
2606 ppp->dev->hard_header_len = hdrlen; 2604 ppp->dev->hard_header_len = hdrlen;
2607 list_add_tail(&pch->clist, &ppp->channels); 2605 list_add_tail(&pch->clist, &ppp->channels);
2608 ++ppp->n_channels; 2606 ++ppp->n_channels;
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index d5b9dd842c61..1902f4fabde1 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -1503,6 +1503,11 @@ static int __netdev_rx(struct net_device *dev, int *quota)
1503 desc->status = 0; 1503 desc->status = 0;
1504 np->rx_done = (np->rx_done + 1) % DONE_Q_SIZE; 1504 np->rx_done = (np->rx_done + 1) % DONE_Q_SIZE;
1505 } 1505 }
1506
1507 if (*quota == 0) { /* out of rx quota */
1508 retcode = 1;
1509 goto out;
1510 }
1506 writew(np->rx_done, np->base + CompletionQConsumerIdx); 1511 writew(np->rx_done, np->base + CompletionQConsumerIdx);
1507 1512
1508 out: 1513 out: