diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2023-01-24 17:44:14 +0100 | 
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2023-01-24 17:44:14 +0100 | 
| commit | d968117a7e8e5572762eacbdbca13bc96710e9a3 (patch) | |
| tree | 5d3e80cad20b80f19147b57ed86236e1680566b8 | |
| parent | 409db27e3a2eb5e8ef7226ca33be33361b3ed1c9 (diff) | |
| download | linux-d968117a7e8e5572762eacbdbca13bc96710e9a3.tar.bz2 | |
Revert "Merge branch 'ethtool-mac-merge'"
This reverts commit 0ad999c1eec879f06cc52ef7df4d0dbee4a2d7eb, reversing
changes made to e38553bdc377e3e7a6caa9dd9770d8b644d8dac3.
It was not intended for net.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
| -rw-r--r-- | net/ethtool/netlink.h | 26 | 
1 files changed, 0 insertions, 26 deletions
| diff --git a/net/ethtool/netlink.h b/net/ethtool/netlink.h index 744b3ab966b0..3753787ba233 100644 --- a/net/ethtool/netlink.h +++ b/net/ethtool/netlink.h @@ -112,32 +112,6 @@ static inline void ethnl_update_u8(u8 *dst, const struct nlattr *attr,  }  /** - * ethnl_update_bool() - update bool from NLA_U8 attribute - * @dst:  value to update - * @attr: netlink attribute with new value or null - * @mod:  pointer to bool for modification tracking - * - * Use the u8 value from NLA_U8 netlink attribute @attr to set bool variable - * pointed to by @dst to false (if zero) or 1 (if not); do nothing if @attr is - * null. Bool pointed to by @mod is set to true if this function changed the - * logical value of *dst, otherwise it is left as is. - */ -static inline void ethnl_update_bool(bool *dst, const struct nlattr *attr, -				     bool *mod) -{ -	u8 val; - -	if (!attr) -		return; -	val = !!nla_get_u8(attr); -	if (*dst == val) -		return; - -	*dst = val; -	*mod = true; -} - -/**   * ethnl_update_bool32() - update u32 used as bool from NLA_U8 attribute   * @dst:  value to update   * @attr: netlink attribute with new value or null |