[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20230405165603.52xafuuhvcqsihtm@skbuf>
Date: Wed, 5 Apr 2023 19:56:03 +0300
From: Vladimir Oltean <vladimir.oltean@....com>
To: netdev@...r.kernel.org, Jakub Kicinski <kuba@...nel.org>
Cc: "David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Paolo Abeni <pabeni@...hat.com>, Andrew Lunn <andrew@...n.ch>,
Florian Fainelli <f.fainelli@...il.com>
Subject: Re: [RFC PATCH net-next] net: dsa: replace
NETDEV_PRE_CHANGE_HWTSTAMP notifier with a stub
On Wed, Apr 05, 2023 at 07:51:15PM +0300, Vladimir Oltean wrote:
> +#if IS_ENABLED(CONFIG_NET_DSA)
> +
> +static inline int dsa_master_hwtstamp_validate(struct net_device *dev,
> + const struct kernel_hwtstamp_config *config,
> + struct netlink_ext_ack *extack)
> +{
> +}
> +
> +#else
> +
> +static inline int dsa_master_hwtstamp_validate(struct net_device *dev,
> + const struct kernel_hwtstamp_config *config)
> +{
> + return 0;
> +}
> +
> +#endif
This happened again, I need to do something about it... I ran
format-patch before I added this last hunk to the commit:
diff --git a/include/net/dsa_stubs.h b/include/net/dsa_stubs.h
index 27a1ad85c038..9556f9fb5a86 100644
--- a/include/net/dsa_stubs.h
+++ b/include/net/dsa_stubs.h
@@ -41,7 +41,8 @@ static inline int dsa_master_hwtstamp_validate(struct net_device *dev,
#else
static inline int dsa_master_hwtstamp_validate(struct net_device *dev,
- const struct kernel_hwtstamp_config *config)
+ const struct kernel_hwtstamp_config *config,
+ struct netlink_ext_ack *extack)
{
return 0;
}
so that the build with CONFIG_NET_DSA=n passes too (which I did test).
It's now fixed on my computer, but whoever is curious to test this will
have to fix it up manually; I won't resend the RFC just for this.
Powered by blists - more mailing lists