Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3dce38a0 authored by John Fastabend's avatar John Fastabend Committed by David S. Miller
Browse files

dcbnl: make get_app handling symmetric for IEEE and CEE DCBx 



The IEEE get/set app handlers use generic routines and do not
require the net_device to implement the dcbnl_ops routines. This
patch makes it symmetric so user space and drivers do not have
to handle the CEE version and IEEE DCBx versions differently.

Signed-off-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5955e752

net/dcb/dcbnl.c

+11 −2
Original line number Original line Diff line number Diff line
@@ -583,7 +583,7 @@ static int dcbnl_getapp(struct net_device *netdev, struct nlattr **tb, 
	u8 up, idtype;

	u8 up, idtype;

	int ret = -EINVAL;

	int ret = -EINVAL;





	if (!tb[DCB_ATTR_APP] || !netdev->dcbnl_ops->getapp)

	if (!tb[DCB_ATTR_APP])

		goto out;

		goto out;





	ret = nla_parse_nested(app_tb, DCB_APP_ATTR_MAX, tb[DCB_ATTR_APP],

	ret = nla_parse_nested(app_tb, DCB_APP_ATTR_MAX, tb[DCB_ATTR_APP],
@@ -604,7 +604,16 @@ static int dcbnl_getapp(struct net_device *netdev, struct nlattr **tb, 
		goto out;

		goto out;





	id = nla_get_u16(app_tb[DCB_APP_ATTR_ID]);

	id = nla_get_u16(app_tb[DCB_APP_ATTR_ID]);



	if (netdev->dcbnl_ops->getapp) {

		up = netdev->dcbnl_ops->getapp(netdev, idtype, id);

		up = netdev->dcbnl_ops->getapp(netdev, idtype, id);

	} else {

		struct dcb_app app = {

					.selector = idtype,

					.protocol = id,

				     };

		up = dcb_getapp(netdev, &app);

	}





	/* send this back */

	/* send this back */

	dcbnl_skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

	dcbnl_skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);