mac80254: Provide real PAN coordinator info in beacons
authorMiquel Raynal <miquel.raynal@bootlin.com>
Tue, 28 Nov 2023 11:16:51 +0000 (12:16 +0100)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Fri, 15 Dec 2023 10:14:49 +0000 (11:14 +0100)
Sending a beacon is a way to advertise a PAN, but also ourselves as
coordinator in the PAN. There is only one PAN coordinator in a PAN, this
is the device without parent (not associated itself to an "upper"
coordinator). Instead of blindly saying that we are the PAN coordinator,
let's actually use our internal information to fill this field.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Acked-by: Stefan Schmidt <stefan@datenfreihafen.org>
Acked-by: Alexander Aring <aahringo@redhat.com>
Link: https://lore.kernel.org/linux-wpan/20231128111655.507479-2-miquel.raynal@bootlin.com
net/mac802154/scan.c

index 7597072aed57b3e40f9cf646a28527df88e5052b..5873da634fb4f0f6b1b998b103a17b0f9af602fb 100644 (file)
@@ -466,6 +466,7 @@ int mac802154_send_beacons_locked(struct ieee802154_sub_if_data *sdata,
                                  struct cfg802154_beacon_request *request)
 {
        struct ieee802154_local *local = sdata->local;
+       struct wpan_dev *wpan_dev = &sdata->wpan_dev;
 
        ASSERT_RTNL();
 
@@ -495,8 +496,7 @@ int mac802154_send_beacons_locked(struct ieee802154_sub_if_data *sdata,
                local->beacon.mac_pl.superframe_order = request->interval;
        local->beacon.mac_pl.final_cap_slot = 0xf;
        local->beacon.mac_pl.battery_life_ext = 0;
-       /* TODO: Fill this field with the coordinator situation in the network */
-       local->beacon.mac_pl.pan_coordinator = 1;
+       local->beacon.mac_pl.pan_coordinator = !wpan_dev->parent;
        local->beacon.mac_pl.assoc_permit = 1;
 
        if (request->interval == IEEE802154_ACTIVE_SCAN_DURATION)