Skip to content

L
linux
Commit 59d19cd7 authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann
Browse files
Options

mac802154: introduce IEEE802154_DEV_TO_SUB_IF 

This function adds a wrapper to call netdev_priv to getting the sdata
attribute. This is similar like the IEEE80211_DEV_TO_SUB_IF function
inside wireless stack implementation.
Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 60741361
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 43 deletions
net/mac802154/ieee802154_i.h
View file @ 59d19cd7
...@@ -107,6 +107,12 @@ hw_to_local(struct ieee802154_hw *hw) ...@@ -107,6 +107,12 @@ hw_to_local(struct ieee802154_hw *hw)
return container_of(hw, struct ieee802154_local, hw); return container_of(hw, struct ieee802154_local, hw);
} }
static inline struct ieee802154_sub_if_data *
IEEE802154_DEV_TO_SUB_IF(const struct net_device *dev)
{
return netdev_priv(dev);
}
extern struct ieee802154_reduced_mlme_ops mac802154_mlme_reduced; extern struct ieee802154_reduced_mlme_ops mac802154_mlme_reduced;
extern struct ieee802154_mlme_ops mac802154_mlme_wpan; extern struct ieee802154_mlme_ops mac802154_mlme_wpan;
......
net/mac802154/iface.c
View file @ 59d19cd7
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
static int mac802154_wpan_update_llsec(struct net_device *dev) static int mac802154_wpan_update_llsec(struct net_device *dev)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
struct ieee802154_mlme_ops *ops = ieee802154_mlme_ops(dev); struct ieee802154_mlme_ops *ops = ieee802154_mlme_ops(dev);
int rc = 0; int rc = 0;
...@@ -56,7 +56,7 @@ static int mac802154_wpan_update_llsec(struct net_device *dev) ...@@ -56,7 +56,7 @@ static int mac802154_wpan_update_llsec(struct net_device *dev)
static int static int
mac802154_wpan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) mac802154_wpan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
struct sockaddr_ieee802154 *sa = struct sockaddr_ieee802154 *sa =
(struct sockaddr_ieee802154 *)&ifr->ifr_addr; (struct sockaddr_ieee802154 *)&ifr->ifr_addr;
int err = -ENOIOCTLCMD; int err = -ENOIOCTLCMD;
...@@ -123,7 +123,7 @@ static int mac802154_wpan_mac_addr(struct net_device *dev, void *p) ...@@ -123,7 +123,7 @@ static int mac802154_wpan_mac_addr(struct net_device *dev, void *p)
int mac802154_set_mac_params(struct net_device *dev, int mac802154_set_mac_params(struct net_device *dev,
const struct ieee802154_mac_params *params) const struct ieee802154_mac_params *params)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
mutex_lock(&sdata->local->iflist_mtx); mutex_lock(&sdata->local->iflist_mtx);
sdata->mac_params = *params; sdata->mac_params = *params;
...@@ -135,7 +135,7 @@ int mac802154_set_mac_params(struct net_device *dev, ...@@ -135,7 +135,7 @@ int mac802154_set_mac_params(struct net_device *dev,
void mac802154_get_mac_params(struct net_device *dev, void mac802154_get_mac_params(struct net_device *dev,
struct ieee802154_mac_params *params) struct ieee802154_mac_params *params)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
mutex_lock(&sdata->local->iflist_mtx); mutex_lock(&sdata->local->iflist_mtx);
*params = sdata->mac_params; *params = sdata->mac_params;
...@@ -145,7 +145,7 @@ void mac802154_get_mac_params(struct net_device *dev, ...@@ -145,7 +145,7 @@ void mac802154_get_mac_params(struct net_device *dev,
static int mac802154_wpan_open(struct net_device *dev) static int mac802154_wpan_open(struct net_device *dev)
{ {
int rc; int rc;
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
struct wpan_phy *phy = sdata->local->phy; struct wpan_phy *phy = sdata->local->phy;
rc = mac802154_slave_open(dev); rc = mac802154_slave_open(dev);
...@@ -241,7 +241,7 @@ static int mac802154_header_create(struct sk_buff *skb, ...@@ -241,7 +241,7 @@ static int mac802154_header_create(struct sk_buff *skb,
unsigned len) unsigned len)
{ {
struct ieee802154_hdr hdr; struct ieee802154_hdr hdr;
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
struct ieee802154_mac_cb *cb = mac_cb(skb); struct ieee802154_mac_cb *cb = mac_cb(skb);
int hlen; int hlen;
...@@ -314,7 +314,7 @@ mac802154_wpan_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -314,7 +314,7 @@ mac802154_wpan_xmit(struct sk_buff *skb, struct net_device *dev)
u8 chan, page; u8 chan, page;
int rc; int rc;
sdata = netdev_priv(dev); sdata = IEEE802154_DEV_TO_SUB_IF(dev);
spin_lock_bh(&sdata->mib_lock); spin_lock_bh(&sdata->mib_lock);
chan = sdata->chan; chan = sdata->chan;
...@@ -357,7 +357,7 @@ static const struct net_device_ops mac802154_wpan_ops = { ...@@ -357,7 +357,7 @@ static const struct net_device_ops mac802154_wpan_ops = {
static void mac802154_wpan_free(struct net_device *dev) static void mac802154_wpan_free(struct net_device *dev)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
mac802154_llsec_destroy(&sdata->sec); mac802154_llsec_destroy(&sdata->sec);
...@@ -384,7 +384,7 @@ void mac802154_wpan_setup(struct net_device *dev) ...@@ -384,7 +384,7 @@ void mac802154_wpan_setup(struct net_device *dev)
dev->netdev_ops = &mac802154_wpan_ops; dev->netdev_ops = &mac802154_wpan_ops;
dev->ml_priv = &mac802154_mlme_wpan; dev->ml_priv = &mac802154_mlme_wpan;
sdata = netdev_priv(dev); sdata = IEEE802154_DEV_TO_SUB_IF(dev);
sdata->type = IEEE802154_DEV_WPAN; sdata->type = IEEE802154_DEV_WPAN;
sdata->chan = MAC802154_CHAN_NONE; sdata->chan = MAC802154_CHAN_NONE;
......
net/mac802154/mac_cmd.c
View file @ 59d19cd7
...@@ -75,7 +75,7 @@ static int mac802154_mlme_start_req(struct net_device *dev, ...@@ -75,7 +75,7 @@ static int mac802154_mlme_start_req(struct net_device *dev,
static struct wpan_phy *mac802154_get_phy(const struct net_device *dev) static struct wpan_phy *mac802154_get_phy(const struct net_device *dev)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
......
net/mac802154/main.c
View file @ 59d19cd7
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
int mac802154_slave_open(struct net_device *dev) int mac802154_slave_open(struct net_device *dev)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
struct ieee802154_sub_if_data *subif; struct ieee802154_sub_if_data *subif;
struct ieee802154_local *local = sdata->local; struct ieee802154_local *local = sdata->local;
int res = 0; int res = 0;
...@@ -81,7 +81,7 @@ int mac802154_slave_open(struct net_device *dev) ...@@ -81,7 +81,7 @@ int mac802154_slave_open(struct net_device *dev)
int mac802154_slave_close(struct net_device *dev) int mac802154_slave_close(struct net_device *dev)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
struct ieee802154_local *local = sdata->local; struct ieee802154_local *local = sdata->local;
ASSERT_RTNL(); ASSERT_RTNL();
...@@ -101,13 +101,12 @@ int mac802154_slave_close(struct net_device *dev) ...@@ -101,13 +101,12 @@ int mac802154_slave_close(struct net_device *dev)
static int static int
mac802154_netdev_register(struct wpan_phy *phy, struct net_device *dev) mac802154_netdev_register(struct wpan_phy *phy, struct net_device *dev)
{ {
struct ieee802154_sub_if_data *sdata; struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
struct ieee802154_local *local; struct ieee802154_local *local;
int err; int err;
local = wpan_phy_priv(phy); local = wpan_phy_priv(phy);
sdata = netdev_priv(dev);
sdata->dev = dev; sdata->dev = dev;
sdata->local = local; sdata->local = local;
...@@ -138,12 +137,10 @@ mac802154_netdev_register(struct wpan_phy *phy, struct net_device *dev) ...@@ -138,12 +137,10 @@ mac802154_netdev_register(struct wpan_phy *phy, struct net_device *dev)
static void static void
mac802154_del_iface(struct wpan_phy *phy, struct net_device *dev) mac802154_del_iface(struct wpan_phy *phy, struct net_device *dev)
{ {
struct ieee802154_sub_if_data *sdata; struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
ASSERT_RTNL(); ASSERT_RTNL();
sdata = netdev_priv(dev);
BUG_ON(sdata->local->phy != phy); BUG_ON(sdata->local->phy != phy);
mutex_lock(&sdata->local->iflist_mtx); mutex_lock(&sdata->local->iflist_mtx);
......
net/mac802154/mib.c
View file @ 59d19cd7
...@@ -38,7 +38,7 @@ struct hw_addr_filt_notify_work { ...@@ -38,7 +38,7 @@ struct hw_addr_filt_notify_work {
static struct ieee802154_local *mac802154_slave_get_priv(struct net_device *dev) static struct ieee802154_local *mac802154_slave_get_priv(struct net_device *dev)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
...@@ -62,7 +62,7 @@ static void hw_addr_notify(struct work_struct *work) ...@@ -62,7 +62,7 @@ static void hw_addr_notify(struct work_struct *work)
static void set_hw_addr_filt(struct net_device *dev, unsigned long changed) static void set_hw_addr_filt(struct net_device *dev, unsigned long changed)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
struct hw_addr_filt_notify_work *work; struct hw_addr_filt_notify_work *work;
work = kzalloc(sizeof(*work), GFP_ATOMIC); work = kzalloc(sizeof(*work), GFP_ATOMIC);
...@@ -77,7 +77,7 @@ static void set_hw_addr_filt(struct net_device *dev, unsigned long changed) ...@@ -77,7 +77,7 @@ static void set_hw_addr_filt(struct net_device *dev, unsigned long changed)
void mac802154_dev_set_short_addr(struct net_device *dev, __le16 val) void mac802154_dev_set_short_addr(struct net_device *dev, __le16 val)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
...@@ -94,7 +94,7 @@ void mac802154_dev_set_short_addr(struct net_device *dev, __le16 val) ...@@ -94,7 +94,7 @@ void mac802154_dev_set_short_addr(struct net_device *dev, __le16 val)
__le16 mac802154_dev_get_short_addr(const struct net_device *dev) __le16 mac802154_dev_get_short_addr(const struct net_device *dev)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
__le16 ret; __le16 ret;
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
...@@ -108,7 +108,7 @@ __le16 mac802154_dev_get_short_addr(const struct net_device *dev) ...@@ -108,7 +108,7 @@ __le16 mac802154_dev_get_short_addr(const struct net_device *dev)
void mac802154_dev_set_ieee_addr(struct net_device *dev) void mac802154_dev_set_ieee_addr(struct net_device *dev)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
struct ieee802154_local *local = sdata->local; struct ieee802154_local *local = sdata->local;
sdata->extended_addr = ieee802154_devaddr_from_raw(dev->dev_addr); sdata->extended_addr = ieee802154_devaddr_from_raw(dev->dev_addr);
...@@ -122,7 +122,7 @@ void mac802154_dev_set_ieee_addr(struct net_device *dev) ...@@ -122,7 +122,7 @@ void mac802154_dev_set_ieee_addr(struct net_device *dev)
__le16 mac802154_dev_get_pan_id(const struct net_device *dev) __le16 mac802154_dev_get_pan_id(const struct net_device *dev)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
__le16 ret; __le16 ret;
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
...@@ -136,7 +136,7 @@ __le16 mac802154_dev_get_pan_id(const struct net_device *dev) ...@@ -136,7 +136,7 @@ __le16 mac802154_dev_get_pan_id(const struct net_device *dev)
void mac802154_dev_set_pan_id(struct net_device *dev, __le16 val) void mac802154_dev_set_pan_id(struct net_device *dev, __le16 val)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
...@@ -153,7 +153,7 @@ void mac802154_dev_set_pan_id(struct net_device *dev, __le16 val) ...@@ -153,7 +153,7 @@ void mac802154_dev_set_pan_id(struct net_device *dev, __le16 val)
u8 mac802154_dev_get_dsn(const struct net_device *dev) u8 mac802154_dev_get_dsn(const struct net_device *dev)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
...@@ -164,8 +164,9 @@ static void phy_chan_notify(struct work_struct *work) ...@@ -164,8 +164,9 @@ static void phy_chan_notify(struct work_struct *work)
{ {
struct phy_chan_notify_work *nw = container_of(work, struct phy_chan_notify_work *nw = container_of(work,
struct phy_chan_notify_work, work); struct phy_chan_notify_work, work);
struct ieee802154_local *local = mac802154_slave_get_priv(nw->dev); struct net_device *dev = nw->dev;
struct ieee802154_sub_if_data *sdata = netdev_priv(nw->dev); struct ieee802154_local *local = mac802154_slave_get_priv(dev);
struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
int res; int res;
mutex_lock(&sdata->local->phy->pib_lock); mutex_lock(&sdata->local->phy->pib_lock);
...@@ -183,7 +184,7 @@ static void phy_chan_notify(struct work_struct *work) ...@@ -183,7 +184,7 @@ static void phy_chan_notify(struct work_struct *work)
void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan) void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
struct phy_chan_notify_work *work; struct phy_chan_notify_work *work;
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
...@@ -214,7 +215,7 @@ void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan) ...@@ -214,7 +215,7 @@ void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan)
int mac802154_get_params(struct net_device *dev, int mac802154_get_params(struct net_device *dev,
struct ieee802154_llsec_params *params) struct ieee802154_llsec_params *params)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
int res; int res;
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
...@@ -230,7 +231,7 @@ int mac802154_set_params(struct net_device *dev, ...@@ -230,7 +231,7 @@ int mac802154_set_params(struct net_device *dev,
const struct ieee802154_llsec_params *params, const struct ieee802154_llsec_params *params,
int changed) int changed)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
int res; int res;
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
...@@ -247,7 +248,7 @@ int mac802154_add_key(struct net_device *dev, ...@@ -247,7 +248,7 @@ int mac802154_add_key(struct net_device *dev,
const struct ieee802154_llsec_key_id *id, const struct ieee802154_llsec_key_id *id,
const struct ieee802154_llsec_key *key) const struct ieee802154_llsec_key *key)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
int res; int res;
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
...@@ -262,7 +263,7 @@ int mac802154_add_key(struct net_device *dev, ...@@ -262,7 +263,7 @@ int mac802154_add_key(struct net_device *dev,
int mac802154_del_key(struct net_device *dev, int mac802154_del_key(struct net_device *dev,
const struct ieee802154_llsec_key_id *id) const struct ieee802154_llsec_key_id *id)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
int res; int res;
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
...@@ -278,7 +279,7 @@ int mac802154_del_key(struct net_device *dev, ...@@ -278,7 +279,7 @@ int mac802154_del_key(struct net_device *dev,
int mac802154_add_dev(struct net_device *dev, int mac802154_add_dev(struct net_device *dev,
const struct ieee802154_llsec_device *llsec_dev) const struct ieee802154_llsec_device *llsec_dev)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
int res; int res;
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
...@@ -292,7 +293,7 @@ int mac802154_add_dev(struct net_device *dev, ...@@ -292,7 +293,7 @@ int mac802154_add_dev(struct net_device *dev,
int mac802154_del_dev(struct net_device *dev, __le64 dev_addr) int mac802154_del_dev(struct net_device *dev, __le64 dev_addr)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
int res; int res;
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
...@@ -309,7 +310,7 @@ int mac802154_add_devkey(struct net_device *dev, ...@@ -309,7 +310,7 @@ int mac802154_add_devkey(struct net_device *dev,
__le64 device_addr, __le64 device_addr,
const struct ieee802154_llsec_device_key *key) const struct ieee802154_llsec_device_key *key)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
int res; int res;
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
...@@ -325,7 +326,7 @@ int mac802154_del_devkey(struct net_device *dev, ...@@ -325,7 +326,7 @@ int mac802154_del_devkey(struct net_device *dev,
__le64 device_addr, __le64 device_addr,
const struct ieee802154_llsec_device_key *key) const struct ieee802154_llsec_device_key *key)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
int res; int res;
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
...@@ -341,7 +342,7 @@ int mac802154_del_devkey(struct net_device *dev, ...@@ -341,7 +342,7 @@ int mac802154_del_devkey(struct net_device *dev,
int mac802154_add_seclevel(struct net_device *dev, int mac802154_add_seclevel(struct net_device *dev,
const struct ieee802154_llsec_seclevel *sl) const struct ieee802154_llsec_seclevel *sl)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
int res; int res;
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
...@@ -356,7 +357,7 @@ int mac802154_add_seclevel(struct net_device *dev, ...@@ -356,7 +357,7 @@ int mac802154_add_seclevel(struct net_device *dev,
int mac802154_del_seclevel(struct net_device *dev, int mac802154_del_seclevel(struct net_device *dev,
const struct ieee802154_llsec_seclevel *sl) const struct ieee802154_llsec_seclevel *sl)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
int res; int res;
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
...@@ -371,7 +372,7 @@ int mac802154_del_seclevel(struct net_device *dev, ...@@ -371,7 +372,7 @@ int mac802154_del_seclevel(struct net_device *dev,
void mac802154_lock_table(struct net_device *dev) void mac802154_lock_table(struct net_device *dev)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
...@@ -381,7 +382,7 @@ void mac802154_lock_table(struct net_device *dev) ...@@ -381,7 +382,7 @@ void mac802154_lock_table(struct net_device *dev)
void mac802154_get_table(struct net_device *dev, void mac802154_get_table(struct net_device *dev,
struct ieee802154_llsec_table **t) struct ieee802154_llsec_table **t)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
...@@ -390,7 +391,7 @@ void mac802154_get_table(struct net_device *dev, ...@@ -390,7 +391,7 @@ void mac802154_get_table(struct net_device *dev,
void mac802154_unlock_table(struct net_device *dev) void mac802154_unlock_table(struct net_device *dev)
{ {
struct ieee802154_sub_if_data *sdata = netdev_priv(dev); struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
BUG_ON(dev->type != ARPHRD_IEEE802154); BUG_ON(dev->type != ARPHRD_IEEE802154);
......
net/mac802154/monitor.c
View file @ 59d19cd7
...@@ -36,7 +36,7 @@ static netdev_tx_t mac802154_monitor_xmit(struct sk_buff *skb, ...@@ -36,7 +36,7 @@ static netdev_tx_t mac802154_monitor_xmit(struct sk_buff *skb,
struct ieee802154_sub_if_data *sdata; struct ieee802154_sub_if_data *sdata;
u8 chan, page; u8 chan, page;
sdata = netdev_priv(dev); sdata = IEEE802154_DEV_TO_SUB_IF(dev);
/* FIXME: locking */ /* FIXME: locking */
chan = sdata->local->phy->current_channel; chan = sdata->local->phy->current_channel;
...@@ -105,7 +105,7 @@ void mac802154_monitor_setup(struct net_device *dev) ...@@ -105,7 +105,7 @@ void mac802154_monitor_setup(struct net_device *dev)
dev->netdev_ops = &mac802154_monitor_ops; dev->netdev_ops = &mac802154_monitor_ops;
dev->ml_priv = &mac802154_mlme_reduced; dev->ml_priv = &mac802154_mlme_reduced;
sdata = netdev_priv(dev); sdata = IEEE802154_DEV_TO_SUB_IF(dev);
sdata->type = IEEE802154_DEV_MONITOR; sdata->type = IEEE802154_DEV_MONITOR;
sdata->chan = MAC802154_CHAN_NONE; /* not initialized */ sdata->chan = MAC802154_CHAN_NONE; /* not initialized */
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7