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

Merge tag 'ieee802154-for-net-2024-06-27' of... 

Merge tag 'ieee802154-for-net-2024-06-27' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan into main
parents 109e2f5b b8ec0dc3

net/mac802154/main.c

+8 −6
Original line number Diff line number Diff line
@@ -161,8 +161,10 @@ void ieee802154_configure_durations(struct wpan_phy *phy, 
	}



	phy->symbol_duration = duration;

	phy->lifs_period = (IEEE802154_LIFS_PERIOD * phy->symbol_duration) / NSEC_PER_SEC;

	phy->sifs_period = (IEEE802154_SIFS_PERIOD * phy->symbol_duration) / NSEC_PER_SEC;

	phy->lifs_period =

		(IEEE802154_LIFS_PERIOD * phy->symbol_duration) / NSEC_PER_USEC;

	phy->sifs_period =

		(IEEE802154_SIFS_PERIOD * phy->symbol_duration) / NSEC_PER_USEC;

}

EXPORT_SYMBOL(ieee802154_configure_durations);
@@ -184,10 +186,10 @@ static void ieee802154_setup_wpan_phy_pib(struct wpan_phy *wpan_phy) 
	 * Should be done when all drivers sets this value.

	 */



	wpan_phy->lifs_period =

		(IEEE802154_LIFS_PERIOD * wpan_phy->symbol_duration) / 1000;

	wpan_phy->sifs_period =

		(IEEE802154_SIFS_PERIOD * wpan_phy->symbol_duration) / 1000;

	wpan_phy->lifs_period =	(IEEE802154_LIFS_PERIOD *

				 wpan_phy->symbol_duration) / NSEC_PER_USEC;

	wpan_phy->sifs_period =	(IEEE802154_SIFS_PERIOD *

				 wpan_phy->symbol_duration) / NSEC_PER_USEC;

}



int ieee802154_register_hw(struct ieee802154_hw *hw)

net/mac802154/tx.c

+4 −4
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ void ieee802154_xmit_sync_worker(struct work_struct *work) 
	if (res)

		goto err_tx;



	dev->stats.tx_packets++;

	dev->stats.tx_bytes += skb->len;

	DEV_STATS_INC(dev, tx_packets);

	DEV_STATS_ADD(dev, tx_bytes, skb->len);



	ieee802154_xmit_complete(&local->hw, skb, false);
@@ -90,8 +90,8 @@ ieee802154_tx(struct ieee802154_local *local, struct sk_buff *skb) 
		if (ret)

			goto err_wake_netif_queue;



		dev->stats.tx_packets++;

		dev->stats.tx_bytes += len;

		DEV_STATS_INC(dev, tx_packets);

		DEV_STATS_ADD(dev, tx_bytes, len);

	} else {

		local->tx_skb = skb;

		queue_work(local->workqueue, &local->sync_tx_work);