Commit 57205c14 authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann

mac802154: fix typo IEEE802515 to IEEE802154

This patch fixs a typo in address filter defines from IEEE802515 to
IEEE802154.
Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
Cc: Alan Ott <alan@signal11.us>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 139f14ad
...@@ -1097,7 +1097,7 @@ at86rf230_set_hw_addr_filt(struct ieee802154_dev *dev, ...@@ -1097,7 +1097,7 @@ at86rf230_set_hw_addr_filt(struct ieee802154_dev *dev,
{ {
struct at86rf230_local *lp = dev->priv; struct at86rf230_local *lp = dev->priv;
if (changed & IEEE802515_AFILT_SADDR_CHANGED) { if (changed & IEEE802154_AFILT_SADDR_CHANGED) {
u16 addr = le16_to_cpu(filt->short_addr); u16 addr = le16_to_cpu(filt->short_addr);
dev_vdbg(&lp->spi->dev, dev_vdbg(&lp->spi->dev,
...@@ -1106,7 +1106,7 @@ at86rf230_set_hw_addr_filt(struct ieee802154_dev *dev, ...@@ -1106,7 +1106,7 @@ at86rf230_set_hw_addr_filt(struct ieee802154_dev *dev,
__at86rf230_write(lp, RG_SHORT_ADDR_1, addr >> 8); __at86rf230_write(lp, RG_SHORT_ADDR_1, addr >> 8);
} }
if (changed & IEEE802515_AFILT_PANID_CHANGED) { if (changed & IEEE802154_AFILT_PANID_CHANGED) {
u16 pan = le16_to_cpu(filt->pan_id); u16 pan = le16_to_cpu(filt->pan_id);
dev_vdbg(&lp->spi->dev, dev_vdbg(&lp->spi->dev,
...@@ -1115,7 +1115,7 @@ at86rf230_set_hw_addr_filt(struct ieee802154_dev *dev, ...@@ -1115,7 +1115,7 @@ at86rf230_set_hw_addr_filt(struct ieee802154_dev *dev,
__at86rf230_write(lp, RG_PAN_ID_1, pan >> 8); __at86rf230_write(lp, RG_PAN_ID_1, pan >> 8);
} }
if (changed & IEEE802515_AFILT_IEEEADDR_CHANGED) { if (changed & IEEE802154_AFILT_IEEEADDR_CHANGED) {
u8 i, addr[8]; u8 i, addr[8];
memcpy(addr, &filt->ieee_addr, 8); memcpy(addr, &filt->ieee_addr, 8);
...@@ -1125,7 +1125,7 @@ at86rf230_set_hw_addr_filt(struct ieee802154_dev *dev, ...@@ -1125,7 +1125,7 @@ at86rf230_set_hw_addr_filt(struct ieee802154_dev *dev,
__at86rf230_write(lp, RG_IEEE_ADDR_0 + i, addr[i]); __at86rf230_write(lp, RG_IEEE_ADDR_0 + i, addr[i]);
} }
if (changed & IEEE802515_AFILT_PANC_CHANGED) { if (changed & IEEE802154_AFILT_PANC_CHANGED) {
dev_vdbg(&lp->spi->dev, dev_vdbg(&lp->spi->dev,
"at86rf230_set_hw_addr_filt called for panc change\n"); "at86rf230_set_hw_addr_filt called for panc change\n");
if (filt->pan_coord) if (filt->pan_coord)
......
...@@ -593,7 +593,7 @@ cc2520_filter(struct ieee802154_dev *dev, ...@@ -593,7 +593,7 @@ cc2520_filter(struct ieee802154_dev *dev,
{ {
struct cc2520_private *priv = dev->priv; struct cc2520_private *priv = dev->priv;
if (changed & IEEE802515_AFILT_PANID_CHANGED) { if (changed & IEEE802154_AFILT_PANID_CHANGED) {
u16 panid = le16_to_cpu(filt->pan_id); u16 panid = le16_to_cpu(filt->pan_id);
dev_vdbg(&priv->spi->dev, dev_vdbg(&priv->spi->dev,
...@@ -602,7 +602,7 @@ cc2520_filter(struct ieee802154_dev *dev, ...@@ -602,7 +602,7 @@ cc2520_filter(struct ieee802154_dev *dev,
sizeof(panid), (u8 *)&panid); sizeof(panid), (u8 *)&panid);
} }
if (changed & IEEE802515_AFILT_IEEEADDR_CHANGED) { if (changed & IEEE802154_AFILT_IEEEADDR_CHANGED) {
dev_vdbg(&priv->spi->dev, dev_vdbg(&priv->spi->dev,
"cc2520_filter called for IEEE addr\n"); "cc2520_filter called for IEEE addr\n");
cc2520_write_ram(priv, CC2520RAM_IEEEADDR, cc2520_write_ram(priv, CC2520RAM_IEEEADDR,
...@@ -610,7 +610,7 @@ cc2520_filter(struct ieee802154_dev *dev, ...@@ -610,7 +610,7 @@ cc2520_filter(struct ieee802154_dev *dev,
(u8 *)&filt->ieee_addr); (u8 *)&filt->ieee_addr);
} }
if (changed & IEEE802515_AFILT_SADDR_CHANGED) { if (changed & IEEE802154_AFILT_SADDR_CHANGED) {
u16 addr = le16_to_cpu(filt->short_addr); u16 addr = le16_to_cpu(filt->short_addr);
dev_vdbg(&priv->spi->dev, dev_vdbg(&priv->spi->dev,
...@@ -619,7 +619,7 @@ cc2520_filter(struct ieee802154_dev *dev, ...@@ -619,7 +619,7 @@ cc2520_filter(struct ieee802154_dev *dev,
sizeof(addr), (u8 *)&addr); sizeof(addr), (u8 *)&addr);
} }
if (changed & IEEE802515_AFILT_PANC_CHANGED) { if (changed & IEEE802154_AFILT_PANC_CHANGED) {
dev_vdbg(&priv->spi->dev, dev_vdbg(&priv->spi->dev,
"cc2520_filter called for panc change\n"); "cc2520_filter called for panc change\n");
if (filt->pan_coord) if (filt->pan_coord)
......
...@@ -462,7 +462,7 @@ static int mrf24j40_filter(struct ieee802154_dev *dev, ...@@ -462,7 +462,7 @@ static int mrf24j40_filter(struct ieee802154_dev *dev,
dev_dbg(printdev(devrec), "filter\n"); dev_dbg(printdev(devrec), "filter\n");
if (changed & IEEE802515_AFILT_SADDR_CHANGED) { if (changed & IEEE802154_AFILT_SADDR_CHANGED) {
/* Short Addr */ /* Short Addr */
u8 addrh, addrl; u8 addrh, addrl;
...@@ -475,7 +475,7 @@ static int mrf24j40_filter(struct ieee802154_dev *dev, ...@@ -475,7 +475,7 @@ static int mrf24j40_filter(struct ieee802154_dev *dev,
"Set short addr to %04hx\n", filt->short_addr); "Set short addr to %04hx\n", filt->short_addr);
} }
if (changed & IEEE802515_AFILT_IEEEADDR_CHANGED) { if (changed & IEEE802154_AFILT_IEEEADDR_CHANGED) {
/* Device Address */ /* Device Address */
u8 i, addr[8]; u8 i, addr[8];
...@@ -491,7 +491,7 @@ static int mrf24j40_filter(struct ieee802154_dev *dev, ...@@ -491,7 +491,7 @@ static int mrf24j40_filter(struct ieee802154_dev *dev,
#endif #endif
} }
if (changed & IEEE802515_AFILT_PANID_CHANGED) { if (changed & IEEE802154_AFILT_PANID_CHANGED) {
/* PAN ID */ /* PAN ID */
u8 panidl, panidh; u8 panidl, panidh;
...@@ -503,7 +503,7 @@ static int mrf24j40_filter(struct ieee802154_dev *dev, ...@@ -503,7 +503,7 @@ static int mrf24j40_filter(struct ieee802154_dev *dev,
dev_dbg(printdev(devrec), "Set PANID to %04hx\n", filt->pan_id); dev_dbg(printdev(devrec), "Set PANID to %04hx\n", filt->pan_id);
} }
if (changed & IEEE802515_AFILT_PANC_CHANGED) { if (changed & IEEE802154_AFILT_PANC_CHANGED) {
/* Pan Coordinator */ /* Pan Coordinator */
u8 val; u8 val;
int ret; int ret;
......
...@@ -32,13 +32,13 @@ ...@@ -32,13 +32,13 @@
*/ */
/* indicates that the Short Address changed */ /* indicates that the Short Address changed */
#define IEEE802515_AFILT_SADDR_CHANGED 0x00000001 #define IEEE802154_AFILT_SADDR_CHANGED 0x00000001
/* indicates that the IEEE Address changed */ /* indicates that the IEEE Address changed */
#define IEEE802515_AFILT_IEEEADDR_CHANGED 0x00000002 #define IEEE802154_AFILT_IEEEADDR_CHANGED 0x00000002
/* indicates that the PAN ID changed */ /* indicates that the PAN ID changed */
#define IEEE802515_AFILT_PANID_CHANGED 0x00000004 #define IEEE802154_AFILT_PANID_CHANGED 0x00000004
/* indicates that PAN Coordinator status changed */ /* indicates that PAN Coordinator status changed */
#define IEEE802515_AFILT_PANC_CHANGED 0x00000008 #define IEEE802154_AFILT_PANC_CHANGED 0x00000008
struct ieee802154_hw_addr_filt { struct ieee802154_hw_addr_filt {
__le16 pan_id; /* Each independent PAN selects a unique __le16 pan_id; /* Each independent PAN selects a unique
......
...@@ -89,7 +89,7 @@ void mac802154_dev_set_short_addr(struct net_device *dev, __le16 val) ...@@ -89,7 +89,7 @@ void mac802154_dev_set_short_addr(struct net_device *dev, __le16 val)
if ((priv->hw->ops->set_hw_addr_filt) && if ((priv->hw->ops->set_hw_addr_filt) &&
(priv->hw->hw.hw_filt.short_addr != priv->short_addr)) { (priv->hw->hw.hw_filt.short_addr != priv->short_addr)) {
priv->hw->hw.hw_filt.short_addr = priv->short_addr; priv->hw->hw.hw_filt.short_addr = priv->short_addr;
set_hw_addr_filt(dev, IEEE802515_AFILT_SADDR_CHANGED); set_hw_addr_filt(dev, IEEE802154_AFILT_SADDR_CHANGED);
} }
} }
...@@ -117,7 +117,7 @@ void mac802154_dev_set_ieee_addr(struct net_device *dev) ...@@ -117,7 +117,7 @@ void mac802154_dev_set_ieee_addr(struct net_device *dev)
if (mac->ops->set_hw_addr_filt && if (mac->ops->set_hw_addr_filt &&
mac->hw.hw_filt.ieee_addr != priv->extended_addr) { mac->hw.hw_filt.ieee_addr != priv->extended_addr) {
mac->hw.hw_filt.ieee_addr = priv->extended_addr; mac->hw.hw_filt.ieee_addr = priv->extended_addr;
set_hw_addr_filt(dev, IEEE802515_AFILT_IEEEADDR_CHANGED); set_hw_addr_filt(dev, IEEE802154_AFILT_IEEEADDR_CHANGED);
} }
} }
...@@ -148,7 +148,7 @@ void mac802154_dev_set_pan_id(struct net_device *dev, __le16 val) ...@@ -148,7 +148,7 @@ void mac802154_dev_set_pan_id(struct net_device *dev, __le16 val)
if ((priv->hw->ops->set_hw_addr_filt) && if ((priv->hw->ops->set_hw_addr_filt) &&
(priv->hw->hw.hw_filt.pan_id != priv->pan_id)) { (priv->hw->hw.hw_filt.pan_id != priv->pan_id)) {
priv->hw->hw.hw_filt.pan_id = priv->pan_id; priv->hw->hw.hw_filt.pan_id = priv->pan_id;
set_hw_addr_filt(dev, IEEE802515_AFILT_PANID_CHANGED); set_hw_addr_filt(dev, IEEE802154_AFILT_PANID_CHANGED);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment