Commit d968117a authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Revert "Merge branch 'ethtool-mac-merge'" 



This reverts commit 0ad999c1, reversing
changes made to e38553bd.

It was not intended for net.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 409db27e

net/ethtool/netlink.h

+0 −26
Original line number Diff line number Diff line
@@ -111,32 +111,6 @@ static inline void ethnl_update_u8(u8 *dst, const struct nlattr *attr, 
	*mod = true;

}



/**

 * 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