summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-03-31 11:06:08 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-10-17 14:35:40 +0100
commit1b526028590f6746a36d60ca9e51b44cfee6a6fe (patch)
tree3d5a4e6fa0179cc61c6d21b2c4f2ef3a18a562a1
parentbfba6f845998dfb17272e64fccd9b2e7e1d88d7b (diff)
net:fec: remove unnecessary code
fec_enet_bd_init() already frees the transmit skbuffs, so there's no need for fec_restart() to do this again. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/net/ethernet/freescale/fec.h1
-rw-r--r--drivers/net/ethernet/freescale/fec_main.c8
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
index d9eb328559d8..442fa513e000 100644
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@ -254,7 +254,6 @@ union bufdesc_u {
#define FEC_ENET_TX_FRSIZE 2048
#define FEC_ENET_TX_FRPPG (PAGE_SIZE / FEC_ENET_TX_FRSIZE)
#define TX_RING_SIZE 512 /* Must be power of two */
-#define TX_RING_MOD_MASK 511 /* for this to work */
#define BD_ENET_RX_INT 0x00800000
#define BD_ENET_RX_PTP ((ushort)0x0400)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index a29f392e229d..95a9fbd70f4e 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -631,7 +631,6 @@ fec_restart(struct net_device *ndev)
struct fec_enet_private *fep = netdev_priv(ndev);
const struct platform_device_id *id_entry =
platform_get_device_id(fep->pdev);
- int i;
u32 val;
u32 temp_mac[2];
u32 rcntl = OPT_FRAME_SIZE | 0x04;
@@ -665,13 +664,6 @@ fec_restart(struct net_device *ndev)
writel(fep->rx_bd_dma, fep->hwp + FEC_R_DES_START);
writel(fep->tx_bd_dma, fep->hwp + FEC_X_DES_START);
- for (i = 0; i <= TX_RING_MOD_MASK; i++) {
- if (fep->tx_skbuff[i]) {
- dev_kfree_skb_any(fep->tx_skbuff[i]);
- fep->tx_skbuff[i] = NULL;
- }
- }
-
/* Enable MII mode */
if (fep->full_duplex == DUPLEX_FULL) {
/* FD enable */