Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a0b4a738e0e03f5e0d6ca366560f9a48e5adf83a

Authored by Dmitry Eremin-Solenikov
1 parent 375bb0e04b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

wpan-phy: allow specifying a per-page channel mask 

IEEE 802.15.4-2006 defines channel pages that hold channels (max 32 pages,
27 channels per page). Allow the driver to specify supported channels
on pages, other than the first one.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

Showing 3 changed files with 21 additions and 3 deletions Side-by-side Diff

drivers/ieee802154/fakehard.c
Diff comments   View file @ a0b4a73
... ... @@ -356,7 +356,7 @@
356 356 dev->addr_len);
357 357 memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
358 358  
359   - phy->channels_supported = (1 << 27) - 1;
  359 + phy->channels_supported[0] = (1 << 27) - 1;
360 360 phy->transmit_power = 0xbf;
361 361  
362 362 dev->netdev_ops = &fake_ops;
include/net/wpan-phy.h
Diff comments   View file @ a0b4a73
... ... @@ -34,7 +34,7 @@
34 34 */
35 35 u8 current_channel;
36 36 u8 current_page;
37   - u32 channels_supported;
  37 + u32 channels_supported[32];
38 38 u8 transmit_power;
39 39 u8 cca_mode;
40 40  
net/ieee802154/wpan-class.c
Diff comments   View file @ a0b4a73
... ... @@ -40,11 +40,29 @@
40 40  
41 41 MASTER_SHOW(current_channel, "%d");
42 42 MASTER_SHOW(current_page, "%d");
43   -MASTER_SHOW(channels_supported, "%#x");
44 43 MASTER_SHOW_COMPLEX(transmit_power, "%d +- %d dB",
45 44 ((signed char) (phy->transmit_power << 2)) >> 2,
46 45 (phy->transmit_power >> 6) ? (phy->transmit_power >> 6) * 3 : 1 );
47 46 MASTER_SHOW(cca_mode, "%d");
  47 +
  48 +static ssize_t channels_supported_show(struct device *dev,
  49 + struct device_attribute *attr, char *buf)
  50 +{
  51 + struct wpan_phy *phy = container_of(dev, struct wpan_phy, dev);
  52 + int ret;
  53 + int i, len = 0;
  54 +
  55 + mutex_lock(&phy->pib_lock);
  56 + for (i = 0; i < 32; i++) {
  57 + ret = snprintf(buf + len, PAGE_SIZE - len,
  58 + "%#09x\n", phy->channels_supported[i]);
  59 + if (ret < 0)
  60 + break;
  61 + len += ret;
  62 + }
  63 + mutex_unlock(&phy->pib_lock);
  64 + return len;
  65 +}
48 66  
49 67 static struct device_attribute pmib_attrs[] = {
50 68 __ATTR_RO(current_channel),