lkml.org 
[lkml]   [2018]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 013/165] hv_netvsc: Rename ind_table to rx_table
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Haiyang Zhang <haiyangz@microsoft.com>

    [ Commit 47371300dfc269dd8d150e5b872bdbbda98ba809 upstream. ]

    Rename this variable because it is the Receive indirection
    table.

    Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/hyperv/hyperv_net.h | 2 +-
    drivers/net/hyperv/netvsc_drv.c | 4 ++--
    drivers/net/hyperv/rndis_filter.c | 6 +++---
    3 files changed, 6 insertions(+), 6 deletions(-)

    --- a/drivers/net/hyperv/hyperv_net.h
    +++ b/drivers/net/hyperv/hyperv_net.h
    @@ -179,7 +179,7 @@ struct rndis_device {

    u8 hw_mac_adr[ETH_ALEN];
    u8 rss_key[NETVSC_HASH_KEYLEN];
    - u16 ind_table[ITAB_NUM];
    + u16 rx_table[ITAB_NUM];
    };


    --- a/drivers/net/hyperv/netvsc_drv.c
    +++ b/drivers/net/hyperv/netvsc_drv.c
    @@ -1378,7 +1378,7 @@ static int netvsc_get_rxfh(struct net_de
    rndis_dev = ndev->extension;
    if (indir) {
    for (i = 0; i < ITAB_NUM; i++)
    - indir[i] = rndis_dev->ind_table[i];
    + indir[i] = rndis_dev->rx_table[i];
    }

    if (key)
    @@ -1408,7 +1408,7 @@ static int netvsc_set_rxfh(struct net_de
    return -EINVAL;

    for (i = 0; i < ITAB_NUM; i++)
    - rndis_dev->ind_table[i] = indir[i];
    + rndis_dev->rx_table[i] = indir[i];
    }

    if (!key) {
    --- a/drivers/net/hyperv/rndis_filter.c
    +++ b/drivers/net/hyperv/rndis_filter.c
    @@ -759,7 +759,7 @@ int rndis_filter_set_rss_param(struct rn
    /* Set indirection table entries */
    itab = (u32 *)(rssp + 1);
    for (i = 0; i < ITAB_NUM; i++)
    - itab[i] = rdev->ind_table[i];
    + itab[i] = rdev->rx_table[i];

    /* Set hask key values */
    keyp = (u8 *)((unsigned long)rssp + rssp->kashkey_offset);
    @@ -1284,8 +1284,8 @@ struct netvsc_device *rndis_filter_devic
    net_device->num_chn = min(net_device->max_chn, device_info->num_chn);

    for (i = 0; i < ITAB_NUM; i++)
    - rndis_device->ind_table[i] = ethtool_rxfh_indir_default(i,
    - net_device->num_chn);
    + rndis_device->rx_table[i] = ethtool_rxfh_indir_default(
    + i, net_device->num_chn);

    atomic_set(&net_device->open_chn, 1);
    vmbus_set_sc_create_callback(dev->channel, netvsc_sc_open);

    \
     
     \ /
      Last update: 2018-05-24 11:54    [W:4.049 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site