diff options
Diffstat (limited to 'drivers/net/tehuti.c')
-rw-r--r-- | drivers/net/tehuti.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c index 7f4a9683ba1e..3c2679cd196b 100644 --- a/drivers/net/tehuti.c +++ b/drivers/net/tehuti.c | |||
@@ -948,8 +948,7 @@ static void print_rxfd(struct rxf_desc *rxfd); | |||
948 | 948 | ||
949 | static void bdx_rxdb_destroy(struct rxdb *db) | 949 | static void bdx_rxdb_destroy(struct rxdb *db) |
950 | { | 950 | { |
951 | if (db) | 951 | vfree(db); |
952 | vfree(db); | ||
953 | } | 952 | } |
954 | 953 | ||
955 | static struct rxdb *bdx_rxdb_create(int nelem) | 954 | static struct rxdb *bdx_rxdb_create(int nelem) |
@@ -1482,10 +1481,8 @@ static void bdx_tx_db_close(struct txdb *d) | |||
1482 | { | 1481 | { |
1483 | BDX_ASSERT(d == NULL); | 1482 | BDX_ASSERT(d == NULL); |
1484 | 1483 | ||
1485 | if (d->start) { | 1484 | vfree(d->start); |
1486 | vfree(d->start); | 1485 | d->start = NULL; |
1487 | d->start = NULL; | ||
1488 | } | ||
1489 | } | 1486 | } |
1490 | 1487 | ||
1491 | /************************************************************************* | 1488 | /************************************************************************* |
@@ -1718,8 +1715,9 @@ static int bdx_tx_transmit(struct sk_buff *skb, struct net_device *ndev) | |||
1718 | WRITE_REG(priv, f->m.reg_WPTR, f->m.wptr & TXF_WPTR_WR_PTR); | 1715 | WRITE_REG(priv, f->m.reg_WPTR, f->m.wptr & TXF_WPTR_WR_PTR); |
1719 | 1716 | ||
1720 | #endif | 1717 | #endif |
1721 | ndev->trans_start = jiffies; | 1718 | #ifdef BDX_LLTX |
1722 | 1719 | ndev->trans_start = jiffies; /* NETIF_F_LLTX driver :( */ | |
1720 | #endif | ||
1723 | priv->net_stats.tx_packets++; | 1721 | priv->net_stats.tx_packets++; |
1724 | priv->net_stats.tx_bytes += skb->len; | 1722 | priv->net_stats.tx_bytes += skb->len; |
1725 | 1723 | ||