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

Commit 85a2566d authored by OGAWA Hirofumi's avatar OGAWA Hirofumi Committed by Samuel Ortiz
Browse files

nfc: Send same info for both of NFC_CMD_GET_DEVICE and NFC_EVENT_DEVICE_ADDED 



Now, NFC_EVENT_DEVICE_ADDED doesn't send NFC_ATTR_RF_MODE. But
NFC_CMD_GET_DEVICE send.

To get NFC_ATTR_RF_MODE, we have to call NFC_CMD_GET_DEVICE just for
NFC_ATTR_RF_MODE when get NFC_EVENT_DEVICE_ADDED.

This fixes those inconsistent.

Signed-off-by: default avatarOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 9728ee92

net/nfc/netlink.c

+13 −9
Original line number Diff line number Diff line
@@ -303,6 +303,17 @@ int nfc_genl_tm_deactivated(struct nfc_dev *dev) 
	return -EMSGSIZE;

}



static int nfc_genl_setup_device_added(struct nfc_dev *dev, struct sk_buff *msg)

{

	if (nla_put_string(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev)) ||

	    nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx) ||

	    nla_put_u32(msg, NFC_ATTR_PROTOCOLS, dev->supported_protocols) ||

	    nla_put_u8(msg, NFC_ATTR_DEVICE_POWERED, dev->dev_up) ||

	    nla_put_u8(msg, NFC_ATTR_RF_MODE, dev->rf_mode))

		return -1;

	return 0;

}



int nfc_genl_device_added(struct nfc_dev *dev)

{

	struct sk_buff *msg;
@@ -317,10 +328,7 @@ int nfc_genl_device_added(struct nfc_dev *dev) 
	if (!hdr)

		goto free_msg;



	if (nla_put_string(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev)) ||

	    nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx) ||

	    nla_put_u32(msg, NFC_ATTR_PROTOCOLS, dev->supported_protocols) ||

	    nla_put_u8(msg, NFC_ATTR_DEVICE_POWERED, dev->dev_up))

	if (nfc_genl_setup_device_added(dev, msg))

		goto nla_put_failure;



	genlmsg_end(msg, hdr);
@@ -596,11 +604,7 @@ static int nfc_genl_send_device(struct sk_buff *msg, struct nfc_dev *dev, 
	if (cb)

		genl_dump_check_consistent(cb, hdr, &nfc_genl_family);



	if (nla_put_string(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev)) ||

	    nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx) ||

	    nla_put_u32(msg, NFC_ATTR_PROTOCOLS, dev->supported_protocols) ||

	    nla_put_u8(msg, NFC_ATTR_DEVICE_POWERED, dev->dev_up) ||

	    nla_put_u8(msg, NFC_ATTR_RF_MODE, dev->rf_mode))

	if (nfc_genl_setup_device_added(dev, msg))

		goto nla_put_failure;



	genlmsg_end(msg, hdr);