git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drivers/net: fixed drivers that support netpoll use ndo_start_xmit()
[pandora-kernel.git]
/
drivers
/
net
/
b44.c
diff --git
a/drivers/net/b44.c
b/drivers/net/b44.c
index
b70b81e
..
bafca67
100644
(file)
--- a/
drivers/net/b44.c
+++ b/
drivers/net/b44.c
@@
-782,7
+782,7
@@
static int b44_rx(struct b44 *bp, int budget)
drop_it:
b44_recycle_rx(bp, cons, bp->rx_prod);
drop_it_no_recycle:
drop_it:
b44_recycle_rx(bp, cons, bp->rx_prod);
drop_it_no_recycle:
- bp->stats.rx_dropped++;
+ bp->
dev->
stats.rx_dropped++;
goto next_pkt;
}
goto next_pkt;
}
@@
-952,9
+952,10
@@
static int b44_start_xmit(struct sk_buff *skb, struct net_device *dev)
int rc = NETDEV_TX_OK;
dma_addr_t mapping;
u32 len, entry, ctrl;
int rc = NETDEV_TX_OK;
dma_addr_t mapping;
u32 len, entry, ctrl;
+ unsigned long flags;
len = skb->len;
len = skb->len;
- spin_lock_irq
(&bp->lock
);
+ spin_lock_irq
save(&bp->lock, flags
);
/* This is a hard error, log it. */
if (unlikely(TX_BUFFS_AVAIL(bp) < 1)) {
/* This is a hard error, log it. */
if (unlikely(TX_BUFFS_AVAIL(bp) < 1)) {
@@
-1027,7
+1028,7
@@
static int b44_start_xmit(struct sk_buff *skb, struct net_device *dev)
dev->trans_start = jiffies;
out_unlock:
dev->trans_start = jiffies;
out_unlock:
- spin_unlock_irq
(&bp->lock
);
+ spin_unlock_irq
restore(&bp->lock, flags
);
return rc;
return rc;
@@
-1647,7
+1648,7
@@
static int b44_close(struct net_device *dev)
static struct net_device_stats *b44_get_stats(struct net_device *dev)
{
struct b44 *bp = netdev_priv(dev);
static struct net_device_stats *b44_get_stats(struct net_device *dev)
{
struct b44 *bp = netdev_priv(dev);
- struct net_device_stats *nstat = &
bp
->stats;
+ struct net_device_stats *nstat = &
dev
->stats;
struct b44_hw_stats *hwstat = &bp->hw_stats;
/* Convert HW stats into netdevice stats. */
struct b44_hw_stats *hwstat = &bp->hw_stats;
/* Convert HW stats into netdevice stats. */