aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-11-05 14:51:29 -0500
committerMarcel Holtmann <marcel@holtmann.org>2014-11-05 15:53:06 -0500
commit0916c02205ed76c03863b401e60fa105c4008cfa (patch)
tree5ce15909cf66cc7c30cc4d48de1d601d8867a920 /net
parente57a8946847148560114a8deb8e9fad0112530b2 (diff)
mac802154: fix typo promisuous to promiscuous
Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-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 {
87 __le16 pan_id; 87 __le16 pan_id;
88 __le16 short_addr; 88 __le16 short_addr;
89 __le64 extended_addr; 89 __le64 extended_addr;
90 bool promisuous_mode; 90 bool promiscuous_mode;
91 91
92 struct ieee802154_mac_params mac_params; 92 struct ieee802154_mac_params mac_params;
93 93
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)
181 mutex_lock(&phy->pib_lock); 181 mutex_lock(&phy->pib_lock);
182 182
183 if (local->hw.flags & IEEE802154_HW_PROMISCUOUS) { 183 if (local->hw.flags & IEEE802154_HW_PROMISCUOUS) {
184 rc = drv_set_promiscuous_mode(local, sdata->promisuous_mode); 184 rc = drv_set_promiscuous_mode(local, sdata->promiscuous_mode);
185 if (rc < 0) 185 if (rc < 0)
186 goto out; 186 goto out;
187 } 187 }
@@ -419,7 +419,7 @@ ieee802154_setup_sdata(struct ieee802154_sub_if_data *sdata, int type)
419 sdata->dev->destructor = mac802154_wpan_free; 419 sdata->dev->destructor = mac802154_wpan_free;
420 sdata->dev->netdev_ops = &mac802154_wpan_ops; 420 sdata->dev->netdev_ops = &mac802154_wpan_ops;
421 sdata->dev->ml_priv = &mac802154_mlme_wpan; 421 sdata->dev->ml_priv = &mac802154_mlme_wpan;
422 sdata->promisuous_mode = false; 422 sdata->promiscuous_mode = false;
423 423
424 spin_lock_init(&sdata->mib_lock); 424 spin_lock_init(&sdata->mib_lock);
425 mutex_init(&sdata->sec_mtx); 425 mutex_init(&sdata->sec_mtx);
@@ -429,7 +429,7 @@ ieee802154_setup_sdata(struct ieee802154_sub_if_data *sdata, int type)
429 case IEEE802154_DEV_MONITOR: 429 case IEEE802154_DEV_MONITOR:
430 sdata->dev->destructor = free_netdev; 430 sdata->dev->destructor = free_netdev;
431 sdata->dev->netdev_ops = &mac802154_monitor_ops; 431 sdata->dev->netdev_ops = &mac802154_monitor_ops;
432 sdata->promisuous_mode = true; 432 sdata->promiscuous_mode = true;
433 break; 433 break;
434 default: 434 default:
435 BUG(); 435 BUG();