| Message ID | 20220826144049.256134-3-miquel.raynal@bootlin.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | net: ieee802154: Support scanning/beaconing | expand |
Hi, On Fri, Aug 26, 2022 at 10:41 AM Miquel Raynal <miquel.raynal@bootlin.com> wrote: > > This IEEE802154_HW_RX_DROP_BAD_CKSUM flag was only used by hwsim to > reflect the fact that it would not validate the checksum (FCS). In other > words, the filtering level of hwsim is always "NONE" while the core > expects it to be higher. > > Now that we have access to real filtering levels, we can actually use > them and always enforce the "NONE" level in hwsim. Handling this case > correctly in the receive path permits to drop the above mentioned flag. > > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> > --- > drivers/net/ieee802154/mac802154_hwsim.c | 10 +++++++++- > include/net/mac802154.h | 4 ---- > net/mac802154/rx.c | 6 ++---- > 3 files changed, 11 insertions(+), 9 deletions(-) > > diff --git a/drivers/net/ieee802154/mac802154_hwsim.c b/drivers/net/ieee802154/mac802154_hwsim.c > index 38c217bd7c82..d7e4048e8743 100644 > --- a/drivers/net/ieee802154/mac802154_hwsim.c > +++ b/drivers/net/ieee802154/mac802154_hwsim.c > @@ -148,6 +148,8 @@ static int hwsim_hw_start(struct ieee802154_hw *hw) > struct hwsim_phy *phy = hw->priv; > > phy->suspended = false; > + hw->phy->filtering = IEEE802154_FILTERING_NONE; > + > return 0; > } > > @@ -161,6 +163,9 @@ static void hwsim_hw_stop(struct ieee802154_hw *hw) > static int > hwsim_set_promiscuous_mode(struct ieee802154_hw *hw, const bool on) > { > + /* hwsim does not filter anything, so enforce the NONE level */ > + hw->phy->filtering = IEEE802154_FILTERING_NONE; > + > return 0; > } > > @@ -791,7 +796,10 @@ static int hwsim_add_one(struct genl_info *info, struct device *dev, > phy->idx = idx; > INIT_LIST_HEAD(&phy->edges); > > - hw->flags = IEEE802154_HW_PROMISCUOUS | IEEE802154_HW_RX_DROP_BAD_CKSUM; > + /* This is a lie, hwsim does not even filter bad FCS, but we need to > + * advertize a PROMISCUOUS to be able to create COORD interfaces. > + */ I think this is now different because PROMISCUOUS/any disable address filtering will disable AACK and this is not what we want, or? This comment was made with the assumption to deal with acks which we can't? I did not look further into this patch series yet. - Alex
diff --git a/drivers/net/ieee802154/mac802154_hwsim.c b/drivers/net/ieee802154/mac802154_hwsim.c index 38c217bd7c82..d7e4048e8743 100644 --- a/drivers/net/ieee802154/mac802154_hwsim.c +++ b/drivers/net/ieee802154/mac802154_hwsim.c @@ -148,6 +148,8 @@ static int hwsim_hw_start(struct ieee802154_hw *hw) struct hwsim_phy *phy = hw->priv; phy->suspended = false; + hw->phy->filtering = IEEE802154_FILTERING_NONE; + return 0; } @@ -161,6 +163,9 @@ static void hwsim_hw_stop(struct ieee802154_hw *hw) static int hwsim_set_promiscuous_mode(struct ieee802154_hw *hw, const bool on) { + /* hwsim does not filter anything, so enforce the NONE level */ + hw->phy->filtering = IEEE802154_FILTERING_NONE; + return 0; } @@ -791,7 +796,10 @@ static int hwsim_add_one(struct genl_info *info, struct device *dev, phy->idx = idx; INIT_LIST_HEAD(&phy->edges); - hw->flags = IEEE802154_HW_PROMISCUOUS | IEEE802154_HW_RX_DROP_BAD_CKSUM; + /* This is a lie, hwsim does not even filter bad FCS, but we need to + * advertize a PROMISCUOUS to be able to create COORD interfaces. + */ + hw->flags = IEEE802154_HW_PROMISCUOUS; hw->parent = dev; err = ieee802154_register_hw(hw); diff --git a/include/net/mac802154.h b/include/net/mac802154.h index 41c28118790c..a45ec09723f3 100644 --- a/include/net/mac802154.h +++ b/include/net/mac802154.h @@ -111,9 +111,6 @@ struct ieee802154_hw { * promiscuous mode setting. * * @IEEE802154_HW_RX_OMIT_CKSUM: Indicates that receiver omits FCS. - * - * @IEEE802154_HW_RX_DROP_BAD_CKSUM: Indicates that receiver will not filter - * frames with bad checksum. */ enum ieee802154_hw_flags { IEEE802154_HW_TX_OMIT_CKSUM = BIT(0), @@ -123,7 +120,6 @@ enum ieee802154_hw_flags { IEEE802154_HW_AFILT = BIT(4), IEEE802154_HW_PROMISCUOUS = BIT(5), IEEE802154_HW_RX_OMIT_CKSUM = BIT(6), - IEEE802154_HW_RX_DROP_BAD_CKSUM = BIT(7), }; /* Indicates that receiver omits FCS and xmitter will add FCS on it's own. */ diff --git a/net/mac802154/rx.c b/net/mac802154/rx.c index c439125ef2b9..42ebbe45a4c5 100644 --- a/net/mac802154/rx.c +++ b/net/mac802154/rx.c @@ -268,10 +268,8 @@ void ieee802154_rx(struct ieee802154_local *local, struct sk_buff *skb) ieee802154_monitors_rx(local, skb); - /* Check if transceiver doesn't validate the checksum. - * If not we validate the checksum here. - */ - if (local->hw.flags & IEEE802154_HW_RX_DROP_BAD_CKSUM) { + /* Level 1 filtering: Check the FCS by software when relevant */ + if (local->hw.phy->filtering == IEEE802154_FILTERING_NONE) { crc = crc_ccitt(0, skb->data, skb->len); if (crc) { rcu_read_unlock();
This IEEE802154_HW_RX_DROP_BAD_CKSUM flag was only used by hwsim to reflect the fact that it would not validate the checksum (FCS). In other words, the filtering level of hwsim is always "NONE" while the core expects it to be higher. Now that we have access to real filtering levels, we can actually use them and always enforce the "NONE" level in hwsim. Handling this case correctly in the receive path permits to drop the above mentioned flag. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- drivers/net/ieee802154/mac802154_hwsim.c | 10 +++++++++- include/net/mac802154.h | 4 ---- net/mac802154/rx.c | 6 ++---- 3 files changed, 11 insertions(+), 9 deletions(-)