Skip to content

L
linux
Commit e9d8d9c4 authored by Alexander Aring's avatar Alexander Aring Committed by Stefan Schmidt
Browse files
Options

mac802154: move receive parameters above start 

This patch moves all receive parameters above the drv_start()
functionality to make it accessibile in the drv_start() function.
Signed-off-by: default avatarAlexander Aring <aahringo@redhat.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/r/20221007085310.503366-3-miquel.raynal@bootlin.comSigned-off-by: default avatarStefan Schmidt <stefan@datenfreihafen.org>
parent a6a6163b
Show whitespace changes
Inline Side-by-side
Showing with 95 additions and 95 deletions
net/mac802154/driver-ops.h
View file @ e9d8d9c4
...@@ -24,203 +24,221 @@ drv_xmit_sync(struct ieee802154_local *local, struct sk_buff *skb) ...@@ -24,203 +24,221 @@ drv_xmit_sync(struct ieee802154_local *local, struct sk_buff *skb)
return local->ops->xmit_sync(&local->hw, skb); return local->ops->xmit_sync(&local->hw, skb);
} }
static inline int drv_start(struct ieee802154_local *local) static inline int drv_set_pan_id(struct ieee802154_local *local, __le16 pan_id)
{ {
struct ieee802154_hw_addr_filt filt;
int ret; int ret;
might_sleep(); might_sleep();
trace_802154_drv_start(local); if (!local->ops->set_hw_addr_filt) {
local->started = true; WARN_ON(1);
smp_mb(); return -EOPNOTSUPP;
ret = local->ops->start(&local->hw); }
filt.pan_id = pan_id;
trace_802154_drv_set_pan_id(local, pan_id);
ret = local->ops->set_hw_addr_filt(&local->hw, &filt,
IEEE802154_AFILT_PANID_CHANGED);
trace_802154_drv_return_int(local, ret); trace_802154_drv_return_int(local, ret);
return ret; return ret;
} }
static inline void drv_stop(struct ieee802154_local *local) static inline int
drv_set_extended_addr(struct ieee802154_local *local, __le64 extended_addr)
{ {
might_sleep(); struct ieee802154_hw_addr_filt filt;
int ret;
trace_802154_drv_stop(local); might_sleep();
local->ops->stop(&local->hw);
trace_802154_drv_return_void(local);
/* sync away all work on the tasklet before clearing started */ if (!local->ops->set_hw_addr_filt) {
tasklet_disable(&local->tasklet); WARN_ON(1);
tasklet_enable(&local->tasklet); return -EOPNOTSUPP;
}
barrier(); filt.ieee_addr = extended_addr;
local->started = false; trace_802154_drv_set_extended_addr(local, extended_addr);
ret = local->ops->set_hw_addr_filt(&local->hw, &filt,
IEEE802154_AFILT_IEEEADDR_CHANGED);
trace_802154_drv_return_int(local, ret);
return ret;
} }
static inline int static inline int
drv_set_channel(struct ieee802154_local *local, u8 page, u8 channel) drv_set_short_addr(struct ieee802154_local *local, __le16 short_addr)
{ {
struct ieee802154_hw_addr_filt filt;
int ret; int ret;
might_sleep(); might_sleep();
trace_802154_drv_set_channel(local, page, channel); if (!local->ops->set_hw_addr_filt) {
ret = local->ops->set_channel(&local->hw, page, channel); WARN_ON(1);
return -EOPNOTSUPP;
}
filt.short_addr = short_addr;
trace_802154_drv_set_short_addr(local, short_addr);
ret = local->ops->set_hw_addr_filt(&local->hw, &filt,
IEEE802154_AFILT_SADDR_CHANGED);
trace_802154_drv_return_int(local, ret); trace_802154_drv_return_int(local, ret);
return ret; return ret;
} }
static inline int drv_set_tx_power(struct ieee802154_local *local, s32 mbm) static inline int
drv_set_pan_coord(struct ieee802154_local *local, bool is_coord)
{ {
struct ieee802154_hw_addr_filt filt;
int ret; int ret;
might_sleep(); might_sleep();
if (!local->ops->set_txpower) { if (!local->ops->set_hw_addr_filt) {
WARN_ON(1); WARN_ON(1);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
trace_802154_drv_set_tx_power(local, mbm); filt.pan_coord = is_coord;
ret = local->ops->set_txpower(&local->hw, mbm);
trace_802154_drv_set_pan_coord(local, is_coord);
ret = local->ops->set_hw_addr_filt(&local->hw, &filt,
IEEE802154_AFILT_PANC_CHANGED);
trace_802154_drv_return_int(local, ret); trace_802154_drv_return_int(local, ret);
return ret; return ret;
} }
static inline int drv_set_cca_mode(struct ieee802154_local *local, static inline int
const struct wpan_phy_cca *cca) drv_set_promiscuous_mode(struct ieee802154_local *local, bool on)
{ {
int ret; int ret;
might_sleep(); might_sleep();
if (!local->ops->set_cca_mode) { if (!local->ops->set_promiscuous_mode) {
WARN_ON(1); WARN_ON(1);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
trace_802154_drv_set_cca_mode(local, cca); trace_802154_drv_set_promiscuous_mode(local, on);
ret = local->ops->set_cca_mode(&local->hw, cca); ret = local->ops->set_promiscuous_mode(&local->hw, on);
trace_802154_drv_return_int(local, ret); trace_802154_drv_return_int(local, ret);
return ret; return ret;
} }
static inline int drv_set_lbt_mode(struct ieee802154_local *local, bool mode) static inline int drv_start(struct ieee802154_local *local)
{ {
int ret; int ret;
might_sleep(); might_sleep();
if (!local->ops->set_lbt) { trace_802154_drv_start(local);
WARN_ON(1); local->started = true;
return -EOPNOTSUPP; smp_mb();
} ret = local->ops->start(&local->hw);
trace_802154_drv_set_lbt_mode(local, mode);
ret = local->ops->set_lbt(&local->hw, mode);
trace_802154_drv_return_int(local, ret); trace_802154_drv_return_int(local, ret);
return ret; return ret;
} }
static inline void drv_stop(struct ieee802154_local *local)
{
might_sleep();
trace_802154_drv_stop(local);
local->ops->stop(&local->hw);
trace_802154_drv_return_void(local);
/* sync away all work on the tasklet before clearing started */
tasklet_disable(&local->tasklet);
tasklet_enable(&local->tasklet);
barrier();
local->started = false;
}
static inline int static inline int
drv_set_cca_ed_level(struct ieee802154_local *local, s32 mbm) drv_set_channel(struct ieee802154_local *local, u8 page, u8 channel)
{ {
int ret; int ret;
might_sleep(); might_sleep();
if (!local->ops->set_cca_ed_level) { trace_802154_drv_set_channel(local, page, channel);
WARN_ON(1); ret = local->ops->set_channel(&local->hw, page, channel);
return -EOPNOTSUPP;
}
trace_802154_drv_set_cca_ed_level(local, mbm);
ret = local->ops->set_cca_ed_level(&local->hw, mbm);
trace_802154_drv_return_int(local, ret); trace_802154_drv_return_int(local, ret);
return ret; return ret;
} }
static inline int drv_set_pan_id(struct ieee802154_local *local, __le16 pan_id) static inline int drv_set_tx_power(struct ieee802154_local *local, s32 mbm)
{ {
struct ieee802154_hw_addr_filt filt;
int ret; int ret;
might_sleep(); might_sleep();
if (!local->ops->set_hw_addr_filt) { if (!local->ops->set_txpower) {
WARN_ON(1); WARN_ON(1);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
filt.pan_id = pan_id; trace_802154_drv_set_tx_power(local, mbm);
ret = local->ops->set_txpower(&local->hw, mbm);
trace_802154_drv_set_pan_id(local, pan_id);
ret = local->ops->set_hw_addr_filt(&local->hw, &filt,
IEEE802154_AFILT_PANID_CHANGED);
trace_802154_drv_return_int(local, ret); trace_802154_drv_return_int(local, ret);
return ret; return ret;
} }
static inline int static inline int drv_set_cca_mode(struct ieee802154_local *local,
drv_set_extended_addr(struct ieee802154_local *local, __le64 extended_addr) const struct wpan_phy_cca *cca)
{ {
struct ieee802154_hw_addr_filt filt;
int ret; int ret;
might_sleep(); might_sleep();
if (!local->ops->set_hw_addr_filt) { if (!local->ops->set_cca_mode) {
WARN_ON(1); WARN_ON(1);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
filt.ieee_addr = extended_addr; trace_802154_drv_set_cca_mode(local, cca);
ret = local->ops->set_cca_mode(&local->hw, cca);
trace_802154_drv_set_extended_addr(local, extended_addr);
ret = local->ops->set_hw_addr_filt(&local->hw, &filt,
IEEE802154_AFILT_IEEEADDR_CHANGED);
trace_802154_drv_return_int(local, ret); trace_802154_drv_return_int(local, ret);
return ret; return ret;
} }
static inline int static inline int drv_set_lbt_mode(struct ieee802154_local *local, bool mode)
drv_set_short_addr(struct ieee802154_local *local, __le16 short_addr)
{ {
struct ieee802154_hw_addr_filt filt;
int ret; int ret;
might_sleep(); might_sleep();
if (!local->ops->set_hw_addr_filt) { if (!local->ops->set_lbt) {
WARN_ON(1); WARN_ON(1);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
filt.short_addr = short_addr; trace_802154_drv_set_lbt_mode(local, mode);
ret = local->ops->set_lbt(&local->hw, mode);
trace_802154_drv_set_short_addr(local, short_addr);
ret = local->ops->set_hw_addr_filt(&local->hw, &filt,
IEEE802154_AFILT_SADDR_CHANGED);
trace_802154_drv_return_int(local, ret); trace_802154_drv_return_int(local, ret);
return ret; return ret;
} }
static inline int static inline int
drv_set_pan_coord(struct ieee802154_local *local, bool is_coord) drv_set_cca_ed_level(struct ieee802154_local *local, s32 mbm)
{ {
struct ieee802154_hw_addr_filt filt;
int ret; int ret;
might_sleep(); might_sleep();
if (!local->ops->set_hw_addr_filt) { if (!local->ops->set_cca_ed_level) {
WARN_ON(1); WARN_ON(1);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
filt.pan_coord = is_coord; trace_802154_drv_set_cca_ed_level(local, mbm);
ret = local->ops->set_cca_ed_level(&local->hw, mbm);
trace_802154_drv_set_pan_coord(local, is_coord);
ret = local->ops->set_hw_addr_filt(&local->hw, &filt,
IEEE802154_AFILT_PANC_CHANGED);
trace_802154_drv_return_int(local, ret); trace_802154_drv_return_int(local, ret);
return ret; return ret;
} }
...@@ -264,22 +282,4 @@ drv_set_max_frame_retries(struct ieee802154_local *local, s8 max_frame_retries) ...@@ -264,22 +282,4 @@ drv_set_max_frame_retries(struct ieee802154_local *local, s8 max_frame_retries)
return ret; return ret;
} }
static inline int
drv_set_promiscuous_mode(struct ieee802154_local *local, bool on)
{
int ret;
might_sleep();
if (!local->ops->set_promiscuous_mode) {
WARN_ON(1);
return -EOPNOTSUPP;
}
trace_802154_drv_set_promiscuous_mode(local, on);
ret = local->ops->set_promiscuous_mode(&local->hw, on);
trace_802154_drv_return_int(local, ret);
return ret;
}
#endif /* __MAC802154_DRIVER_OPS */ #endif /* __MAC802154_DRIVER_OPS */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7