Commit da0afd1f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'vxlan-geneve-use-the-correct-nlattr-array-for-extack' 



Sabrina Dubroca says:

====================
net: vxlan/geneve: use the correct nlattr array for extack

The ->validate callbacks for vxlan and geneve have a couple of typos
in extack, where the nlattr array for IFLA_* attributes is used
instead of the link-specific one.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c391eb83 9a7b5b50

drivers/net/geneve.c

+1 −1
Original line number Diff line number Diff line
@@ -1207,7 +1207,7 @@ static int geneve_validate(struct nlattr *tb[], struct nlattr *data[], 
		enum ifla_geneve_df df = nla_get_u8(data[IFLA_GENEVE_DF]);



		if (df < 0 || df > GENEVE_DF_MAX) {

			NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_GENEVE_DF],

			NL_SET_ERR_MSG_ATTR(extack, data[IFLA_GENEVE_DF],

					    "Invalid DF attribute");

			return -EINVAL;

		}

drivers/net/vxlan.c

+3 −3
Original line number Diff line number Diff line
@@ -3144,7 +3144,7 @@ static int vxlan_validate(struct nlattr *tb[], struct nlattr *data[], 
		u32 id = nla_get_u32(data[IFLA_VXLAN_ID]);



		if (id >= VXLAN_N_VID) {

			NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_VXLAN_ID],

			NL_SET_ERR_MSG_ATTR(extack, data[IFLA_VXLAN_ID],

					    "VXLAN ID must be lower than 16777216");

			return -ERANGE;

		}
@@ -3155,7 +3155,7 @@ static int vxlan_validate(struct nlattr *tb[], struct nlattr *data[], 
			= nla_data(data[IFLA_VXLAN_PORT_RANGE]);



		if (ntohs(p->high) < ntohs(p->low)) {

			NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_VXLAN_PORT_RANGE],

			NL_SET_ERR_MSG_ATTR(extack, data[IFLA_VXLAN_PORT_RANGE],

					    "Invalid source port range");

			return -EINVAL;

		}
@@ -3165,7 +3165,7 @@ static int vxlan_validate(struct nlattr *tb[], struct nlattr *data[], 
		enum ifla_vxlan_df df = nla_get_u8(data[IFLA_VXLAN_DF]);



		if (df < 0 || df > VXLAN_DF_MAX) {

			NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_VXLAN_DF],

			NL_SET_ERR_MSG_ATTR(extack, data[IFLA_VXLAN_DF],

					    "Invalid DF attribute");

			return -EINVAL;

		}