diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-26 14:47:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-26 14:47:03 -0500 |
| commit | 6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c (patch) | |
| tree | cd71e597bbbe677820bb229c6aedbad412758959 /drivers/net/ethernet/broadcom/b44.c | |
| parent | d6f03f29f7cdf064289f941bf0b838348e996e65 (diff) | |
| parent | fc0b927d9a5024e138c4318fe19a590f23e3eeec (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/ipv4/inet_diag.c
Diffstat (limited to 'drivers/net/ethernet/broadcom/b44.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/b44.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c index 4cf835dbc122..3fb66d09ece5 100644 --- a/drivers/net/ethernet/broadcom/b44.c +++ b/drivers/net/ethernet/broadcom/b44.c | |||
| @@ -608,7 +608,7 @@ static void b44_tx(struct b44 *bp) | |||
| 608 | skb->len, | 608 | skb->len, |
| 609 | DMA_TO_DEVICE); | 609 | DMA_TO_DEVICE); |
| 610 | rp->skb = NULL; | 610 | rp->skb = NULL; |
| 611 | dev_kfree_skb(skb); | 611 | dev_kfree_skb_irq(skb); |
| 612 | } | 612 | } |
| 613 | 613 | ||
| 614 | bp->tx_cons = cons; | 614 | bp->tx_cons = cons; |