summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-11-05 20:51:29 +0100
committerMarcel Holtmann <marcel@holtmann.org>2014-11-05 21:53:06 +0100
commit0916c02205ed76c03863b401e60fa105c4008cfa (patch)
tree5ce15909cf66cc7c30cc4d48de1d601d8867a920
parentmac802154: use IEEE802154_EXTENDED_ADDR_LEN (diff)
downloadlinux-0916c02205ed76c03863b401e60fa105c4008cfa.tar.xz
linux-0916c02205ed76c03863b401e60fa105c4008cfa.zip
mac802154: fix typo promisuous to promiscuous
Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--net/mac802154/ieee802154_i.h2
-rw-r--r--net/mac802154/iface.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h
index 931f8516cee6..4acacea0d371 100644
--- a/net/mac802154/ieee802154_i.h
+++ b/net/mac802154/ieee802154_i.h
@@ -87,7 +87,7 @@ struct ieee802154_sub_if_data {
__le16 pan_id;
__le16 short_addr;
__le64 extended_addr;
- bool promisuous_mode;
+ bool promiscuous_mode;
struct ieee802154_mac_params mac_params;
diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index 51abe05a6aab..384f4bb3c99b 100644
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -181,7 +181,7 @@ static int mac802154_wpan_open(struct net_device *dev)
mutex_lock(&phy->pib_lock);
if (local->hw.flags & IEEE802154_HW_PROMISCUOUS) {
- rc = drv_set_promiscuous_mode(local, sdata->promisuous_mode);
+ rc = drv_set_promiscuous_mode(local, sdata->promiscuous_mode);
if (rc < 0)
goto out;
}
@@ -419,7 +419,7 @@ ieee802154_setup_sdata(struct ieee802154_sub_if_data *sdata, int type)
sdata->dev->destructor = mac802154_wpan_free;
sdata->dev->netdev_ops = &mac802154_wpan_ops;
sdata->dev->ml_priv = &mac802154_mlme_wpan;
- sdata->promisuous_mode = false;
+ sdata->promiscuous_mode = false;
spin_lock_init(&sdata->mib_lock);
mutex_init(&sdata->sec_mtx);
@@ -429,7 +429,7 @@ ieee802154_setup_sdata(struct ieee802154_sub_if_data *sdata, int type)
case IEEE802154_DEV_MONITOR:
sdata->dev->destructor = free_netdev;
sdata->dev->netdev_ops = &mac802154_monitor_ops;
- sdata->promisuous_mode = true;
+ sdata->promiscuous_mode = true;
break;
default:
BUG();