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

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

Merge branch 'ieee802154-for-davem-2017-10-18' of... 

Merge branch 'ieee802154-for-davem-2017-10-18' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next



Stefan Schmidt says:

====================
pull-request: ieee802154 2017-10-18

Please find below a pull request from the ieee802154 subsystem for net-next.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3c75f9b1 396665e8

drivers/net/ieee802154/atusb.c

+3 −5
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ 
#define ATUSB_ALLOC_DELAY_MS	100	/* delay after failed allocation */

#define ATUSB_TX_TIMEOUT_MS	200	/* on the air timeout */



struct atusb_chip_data;



struct atusb {

	struct ieee802154_hw *hw;

	struct usb_device *usb_dev;
@@ -767,14 +765,14 @@ atusb_set_promiscuous_mode(struct ieee802154_hw *hw, const bool on) 
	return 0;

}



struct atusb_chip_data atusb_chip_data = {

static struct atusb_chip_data atusb_chip_data = {

	.t_channel_switch = 1,

	.rssi_base_val = -91,

	.set_txpower = atusb_set_txpower,

	.set_channel = atusb_set_channel,

};



struct atusb_chip_data hulusb_chip_data = {

static struct atusb_chip_data hulusb_chip_data = {

	.t_channel_switch = 11,

	.rssi_base_val = -100,

	.set_txpower = hulusb_set_txpower,
@@ -1060,7 +1058,7 @@ static int atusb_probe(struct usb_interface *interface, 
	atusb_get_and_show_build(atusb);

	atusb_set_extended_addr(atusb);



	if (atusb->fw_ver_maj >= 0 && atusb->fw_ver_min >= 3)

	if ((atusb->fw_ver_maj == 0 && atusb->fw_ver_min >= 3) || atusb->fw_ver_maj > 0)

		hw->flags |= IEEE802154_HW_FRAME_RETRIES;



	ret = atusb_get_and_clear_error(atusb);

net/ieee802154/netlink.c

+3 −3
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ int ieee802154_nl_reply(struct sk_buff *msg, struct genl_info *info) 
	return genlmsg_reply(msg, info);

}



static const struct genl_ops ieee8021154_ops[] = {

static const struct genl_ops ieee802154_ops[] = {

	/* see nl-phy.c */

	IEEE802154_DUMP(IEEE802154_LIST_PHY, ieee802154_list_phy,

			ieee802154_dump_phy),
@@ -137,8 +137,8 @@ struct genl_family nl802154_family __ro_after_init = { 
	.version	= 1,

	.maxattr	= IEEE802154_ATTR_MAX,

	.module		= THIS_MODULE,

	.ops		= ieee8021154_ops,

	.n_ops		= ARRAY_SIZE(ieee8021154_ops),

	.ops		= ieee802154_ops,

	.n_ops		= ARRAY_SIZE(ieee802154_ops),

	.mcgrps		= ieee802154_mcgrps,

	.n_mcgrps	= ARRAY_SIZE(ieee802154_mcgrps),

};