lkml.org 
[lkml]   [2015]   [Nov]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next v3 07/17] net: ipvlan: use __ethtool_get_ksettings
    Date
    From: David Decotigny <decot@googlers.com>

    Signed-off-by: David Decotigny <decot@googlers.com>
    ---
    drivers/net/ipvlan/ipvlan_main.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
    index a9268db..63b3aa5 100644
    --- a/drivers/net/ipvlan/ipvlan_main.c
    +++ b/drivers/net/ipvlan/ipvlan_main.c
    @@ -346,12 +346,12 @@ static const struct header_ops ipvlan_header_ops = {
    .cache_update = eth_header_cache_update,
    };

    -static int ipvlan_ethtool_get_settings(struct net_device *dev,
    - struct ethtool_cmd *cmd)
    +static int ipvlan_ethtool_get_ksettings(struct net_device *dev,
    + struct ethtool_ksettings *cmd)
    {
    const struct ipvl_dev *ipvlan = netdev_priv(dev);

    - return __ethtool_get_settings(ipvlan->phy_dev, cmd);
    + return __ethtool_get_ksettings(ipvlan->phy_dev, cmd);
    }

    static void ipvlan_ethtool_get_drvinfo(struct net_device *dev,
    @@ -377,7 +377,7 @@ static void ipvlan_ethtool_set_msglevel(struct net_device *dev, u32 value)

    static const struct ethtool_ops ipvlan_ethtool_ops = {
    .get_link = ethtool_op_get_link,
    - .get_settings = ipvlan_ethtool_get_settings,
    + .get_ksettings = ipvlan_ethtool_get_ksettings,
    .get_drvinfo = ipvlan_ethtool_get_drvinfo,
    .get_msglevel = ipvlan_ethtool_get_msglevel,
    .set_msglevel = ipvlan_ethtool_set_msglevel,
    --
    2.6.0.rc2.230.g3dd15c0


    \
     
     \ /
      Last update: 2015-11-30 23:21    [W:2.441 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site