diff options
| author | Matteo Croce <rootkit85@yahoo.it> | 2008-01-12 13:05:23 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2008-01-18 14:45:41 -0500 |
| commit | ba596a01886b236c8171fc28d53842da0128224e (patch) | |
| tree | b255daf407f5864ad96cada0551cb877372bb4a3 /drivers/net | |
| parent | 0ca5f319f4bef00d31a21614345ecd5ea0ca8afd (diff) | |
Replace cpmac fix
Please apply this patch since i reverted by mistake
the commit 4e3ab47a547616e583c7a5458beced6aa34c8ef3
in 6cd043d99dcf5d252fcc682958541f449113f7b3
Signed-off-by: Matteo Croce <technoboy85@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/cpmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c index 6fd95a2c8cec..6e12d48351b8 100644 --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c | |||
| @@ -459,7 +459,7 @@ static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 459 | return NETDEV_TX_OK; | 459 | return NETDEV_TX_OK; |
| 460 | 460 | ||
| 461 | len = max(skb->len, ETH_ZLEN); | 461 | len = max(skb->len, ETH_ZLEN); |
| 462 | queue = skb->queue_mapping; | 462 | queue = skb_get_queue_mapping(skb); |
| 463 | #ifdef CONFIG_NETDEVICES_MULTIQUEUE | 463 | #ifdef CONFIG_NETDEVICES_MULTIQUEUE |
| 464 | netif_stop_subqueue(dev, queue); | 464 | netif_stop_subqueue(dev, queue); |
| 465 | #else | 465 | #else |