lkml.org 
[lkml]   [2006]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH 18/21]: powerpc/cell spidernet variable name change
    From

    Cosmetic patch: give the variable holding the numer of descriptors
    a more descriptive name, so to avoid confusion.

    Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
    Cc: James K Lewis <jklewis@us.ibm.com>
    Cc: Arnd Bergmann <arnd@arndb.de>

    ----

    drivers/net/spider_net.c | 12 ++++++------
    drivers/net/spider_net.h | 4 ++--
    drivers/net/spider_net_ethtool.c | 4 ++--
    3 files changed, 10 insertions(+), 10 deletions(-)

    Index: linux-2.6.18-mm2/drivers/net/spider_net.c
    ===================================================================
    --- linux-2.6.18-mm2.orig/drivers/net/spider_net.c 2006-10-10 13:28:43.000000000 -0500
    +++ linux-2.6.18-mm2/drivers/net/spider_net.c 2006-10-10 13:35:33.000000000 -0500
    @@ -718,7 +718,7 @@ spider_net_set_low_watermark(struct spid
    }

    /* If TX queue is short, don't even bother with interrupts */
    - if (cnt < card->tx_desc/4)
    + if (cnt < card->num_tx_desc/4)
    return cnt;

    /* Set low-watermark 3/4th's of the way into the queue. */
    @@ -1666,15 +1666,15 @@ spider_net_open(struct net_device *netde

    result = -ENOMEM;
    if (spider_net_init_chain(card, &card->tx_chain, card->descr,
    - PCI_DMA_TODEVICE, card->tx_desc))
    + PCI_DMA_TODEVICE, card->num_tx_desc))
    goto alloc_tx_failed;

    card->low_watermark = NULL;

    /* rx_chain is after tx_chain, so offset is descr + tx_count */
    if (spider_net_init_chain(card, &card->rx_chain,
    - card->descr + card->tx_desc,
    - PCI_DMA_FROMDEVICE, card->rx_desc))
    + card->descr + card->num_tx_desc,
    + PCI_DMA_FROMDEVICE, card->num_rx_desc))
    goto alloc_rx_failed;

    /* allocate rx skbs */
    @@ -2060,8 +2060,8 @@ spider_net_setup_netdev(struct spider_ne

    card->options.rx_csum = SPIDER_NET_RX_CSUM_DEFAULT;

    - card->tx_desc = tx_descriptors;
    - card->rx_desc = rx_descriptors;
    + card->num_tx_desc = tx_descriptors;
    + card->num_rx_desc = rx_descriptors;

    spider_net_setup_netdev_ops(netdev);

    Index: linux-2.6.18-mm2/drivers/net/spider_net.h
    ===================================================================
    --- linux-2.6.18-mm2.orig/drivers/net/spider_net.h 2006-10-10 13:09:27.000000000 -0500
    +++ linux-2.6.18-mm2/drivers/net/spider_net.h 2006-10-10 13:35:33.000000000 -0500
    @@ -455,8 +455,8 @@ struct spider_net_card {

    /* for ethtool */
    int msg_enable;
    - int rx_desc;
    - int tx_desc;
    + int num_rx_desc;
    + int num_tx_desc;
    struct spider_net_extra_stats spider_stats;

    struct spider_net_descr descr[0];
    Index: linux-2.6.18-mm2/drivers/net/spider_net_ethtool.c
    ===================================================================
    --- linux-2.6.18-mm2.orig/drivers/net/spider_net_ethtool.c 2006-10-10 12:20:05.000000000 -0500
    +++ linux-2.6.18-mm2/drivers/net/spider_net_ethtool.c 2006-10-10 13:35:33.000000000 -0500
    @@ -158,9 +158,9 @@ spider_net_ethtool_get_ringparam(struct
    struct spider_net_card *card = netdev->priv;

    ering->tx_max_pending = SPIDER_NET_TX_DESCRIPTORS_MAX;
    - ering->tx_pending = card->tx_desc;
    + ering->tx_pending = card->num_tx_desc;
    ering->rx_max_pending = SPIDER_NET_RX_DESCRIPTORS_MAX;
    - ering->rx_pending = card->rx_desc;
    + ering->rx_pending = card->num_rx_desc;
    }

    static int spider_net_get_stats_count(struct net_device *netdev)
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-10-10 23:23    [W:0.024 / U:98.308 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site