Commit 7f85b112 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'ieee802154-for-net-2024-09-01' of... 

Merge tag 'ieee802154-for-net-2024-09-01' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan

Stefan Schmidt says:

====================
pull-request: ieee802154 for net 2024-09-01

Simon Horman catched two typos in our headers. No functional change.

* tag 'ieee802154-for-net-2024-09-01' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan:
  ieee802154: Correct spelling in nl802154.h
  mac802154: Correct spelling in mac802154.h
====================

Link: https://patch.msgid.link/20240901184213.2303047-1-stefan@datenfreihafen.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 1a5c4863 3682c302

include/net/mac802154.h

+2 −2
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ enum ieee802154_hw_flags { 
 *

 * xmit_sync:

 *	  Handler that 802.15.4 module calls for each transmitted frame.

 *	  skb cntains the buffer starting from the IEEE 802.15.4 header.

 *	  skb contains the buffer starting from the IEEE 802.15.4 header.

 *	  The low-level driver should send the frame based on available

 *	  configuration. This is called by a workqueue and useful for

 *	  synchronous 802.15.4 drivers.
@@ -152,7 +152,7 @@ enum ieee802154_hw_flags { 
 *

 * xmit_async:

 *	  Handler that 802.15.4 module calls for each transmitted frame.

 *	  skb cntains the buffer starting from the IEEE 802.15.4 header.

 *	  skb contains the buffer starting from the IEEE 802.15.4 header.

 *	  The low-level driver should send the frame based on available

 *	  configuration.

 *	  This function should return zero or negative errno.

include/net/nl802154.h

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ enum nl802154_iftype { 
 * @NL802154_CAP_ATTR_TX_POWERS: a nested attribute for

 *	nl802154_wpan_phy_tx_power

 * @NL802154_CAP_ATTR_MIN_CCA_ED_LEVEL: minimum value for cca_ed_level

 * @NL802154_CAP_ATTR_MAX_CCA_ED_LEVEL: maxmimum value for cca_ed_level

 * @NL802154_CAP_ATTR_MAX_CCA_ED_LEVEL: maximum value for cca_ed_level

 * @NL802154_CAP_ATTR_CCA_MODES: nl802154_cca_modes flags

 * @NL802154_CAP_ATTR_CCA_OPTS: nl802154_cca_opts flags

 * @NL802154_CAP_ATTR_MIN_MINBE: minimum of minbe value