diff options
Diffstat (limited to 'drivers/net/ethernet/atheros/alx/main.c')
-rw-r--r-- | drivers/net/ethernet/atheros/alx/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c index 380d24922049..17bb9ce96260 100644 --- a/drivers/net/ethernet/atheros/alx/main.c +++ b/drivers/net/ethernet/atheros/alx/main.c | |||
@@ -535,7 +535,7 @@ static int alx_alloc_descriptors(struct alx_priv *alx) | |||
535 | if (!alx->descmem.virt) | 535 | if (!alx->descmem.virt) |
536 | goto out_free; | 536 | goto out_free; |
537 | 537 | ||
538 | alx->txq.tpd = (void *)alx->descmem.virt; | 538 | alx->txq.tpd = alx->descmem.virt; |
539 | alx->txq.tpd_dma = alx->descmem.dma; | 539 | alx->txq.tpd_dma = alx->descmem.dma; |
540 | 540 | ||
541 | /* alignment requirement for next block */ | 541 | /* alignment requirement for next block */ |
@@ -1097,7 +1097,7 @@ static netdev_tx_t alx_start_xmit(struct sk_buff *skb, | |||
1097 | return NETDEV_TX_OK; | 1097 | return NETDEV_TX_OK; |
1098 | 1098 | ||
1099 | drop: | 1099 | drop: |
1100 | dev_kfree_skb(skb); | 1100 | dev_kfree_skb_any(skb); |
1101 | return NETDEV_TX_OK; | 1101 | return NETDEV_TX_OK; |
1102 | } | 1102 | } |
1103 | 1103 | ||