diff options
Diffstat (limited to 'net/mac802154/iface.c')
-rw-r--r-- | net/mac802154/iface.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c index c0dbb402b99b..cdd661f0ef3f 100644 --- a/net/mac802154/iface.c +++ b/net/mac802154/iface.c | |||
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | static int mac802154_wpan_update_llsec(struct net_device *dev) | 34 | static int mac802154_wpan_update_llsec(struct net_device *dev) |
35 | { | 35 | { |
36 | struct ieee802154_sub_if_data *sdata = netdev_priv(dev); | 36 | struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev); |
37 | struct ieee802154_mlme_ops *ops = ieee802154_mlme_ops(dev); | 37 | struct ieee802154_mlme_ops *ops = ieee802154_mlme_ops(dev); |
38 | int rc = 0; | 38 | int rc = 0; |
39 | 39 | ||
@@ -56,7 +56,7 @@ static int mac802154_wpan_update_llsec(struct net_device *dev) | |||
56 | static int | 56 | static int |
57 | mac802154_wpan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | 57 | mac802154_wpan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) |
58 | { | 58 | { |
59 | struct ieee802154_sub_if_data *sdata = netdev_priv(dev); | 59 | struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev); |
60 | struct sockaddr_ieee802154 *sa = | 60 | struct sockaddr_ieee802154 *sa = |
61 | (struct sockaddr_ieee802154 *)&ifr->ifr_addr; | 61 | (struct sockaddr_ieee802154 *)&ifr->ifr_addr; |
62 | int err = -ENOIOCTLCMD; | 62 | int err = -ENOIOCTLCMD; |
@@ -123,7 +123,7 @@ static int mac802154_wpan_mac_addr(struct net_device *dev, void *p) | |||
123 | int mac802154_set_mac_params(struct net_device *dev, | 123 | int mac802154_set_mac_params(struct net_device *dev, |
124 | const struct ieee802154_mac_params *params) | 124 | const struct ieee802154_mac_params *params) |
125 | { | 125 | { |
126 | struct ieee802154_sub_if_data *sdata = netdev_priv(dev); | 126 | struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev); |
127 | 127 | ||
128 | mutex_lock(&sdata->local->iflist_mtx); | 128 | mutex_lock(&sdata->local->iflist_mtx); |
129 | sdata->mac_params = *params; | 129 | sdata->mac_params = *params; |
@@ -135,7 +135,7 @@ int mac802154_set_mac_params(struct net_device *dev, | |||
135 | void mac802154_get_mac_params(struct net_device *dev, | 135 | void mac802154_get_mac_params(struct net_device *dev, |
136 | struct ieee802154_mac_params *params) | 136 | struct ieee802154_mac_params *params) |
137 | { | 137 | { |
138 | struct ieee802154_sub_if_data *sdata = netdev_priv(dev); | 138 | struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev); |
139 | 139 | ||
140 | mutex_lock(&sdata->local->iflist_mtx); | 140 | mutex_lock(&sdata->local->iflist_mtx); |
141 | *params = sdata->mac_params; | 141 | *params = sdata->mac_params; |
@@ -145,7 +145,7 @@ void mac802154_get_mac_params(struct net_device *dev, | |||
145 | static int mac802154_wpan_open(struct net_device *dev) | 145 | static int mac802154_wpan_open(struct net_device *dev) |
146 | { | 146 | { |
147 | int rc; | 147 | int rc; |
148 | struct ieee802154_sub_if_data *sdata = netdev_priv(dev); | 148 | struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev); |
149 | struct wpan_phy *phy = sdata->local->phy; | 149 | struct wpan_phy *phy = sdata->local->phy; |
150 | 150 | ||
151 | rc = mac802154_slave_open(dev); | 151 | rc = mac802154_slave_open(dev); |
@@ -241,7 +241,7 @@ static int mac802154_header_create(struct sk_buff *skb, | |||
241 | unsigned len) | 241 | unsigned len) |
242 | { | 242 | { |
243 | struct ieee802154_hdr hdr; | 243 | struct ieee802154_hdr hdr; |
244 | struct ieee802154_sub_if_data *sdata = netdev_priv(dev); | 244 | struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev); |
245 | struct ieee802154_mac_cb *cb = mac_cb(skb); | 245 | struct ieee802154_mac_cb *cb = mac_cb(skb); |
246 | int hlen; | 246 | int hlen; |
247 | 247 | ||
@@ -314,7 +314,7 @@ mac802154_wpan_xmit(struct sk_buff *skb, struct net_device *dev) | |||
314 | u8 chan, page; | 314 | u8 chan, page; |
315 | int rc; | 315 | int rc; |
316 | 316 | ||
317 | sdata = netdev_priv(dev); | 317 | sdata = IEEE802154_DEV_TO_SUB_IF(dev); |
318 | 318 | ||
319 | spin_lock_bh(&sdata->mib_lock); | 319 | spin_lock_bh(&sdata->mib_lock); |
320 | chan = sdata->chan; | 320 | chan = sdata->chan; |
@@ -357,7 +357,7 @@ static const struct net_device_ops mac802154_wpan_ops = { | |||
357 | 357 | ||
358 | static void mac802154_wpan_free(struct net_device *dev) | 358 | static void mac802154_wpan_free(struct net_device *dev) |
359 | { | 359 | { |
360 | struct ieee802154_sub_if_data *sdata = netdev_priv(dev); | 360 | struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev); |
361 | 361 | ||
362 | mac802154_llsec_destroy(&sdata->sec); | 362 | mac802154_llsec_destroy(&sdata->sec); |
363 | 363 | ||
@@ -384,7 +384,7 @@ void mac802154_wpan_setup(struct net_device *dev) | |||
384 | dev->netdev_ops = &mac802154_wpan_ops; | 384 | dev->netdev_ops = &mac802154_wpan_ops; |
385 | dev->ml_priv = &mac802154_mlme_wpan; | 385 | dev->ml_priv = &mac802154_mlme_wpan; |
386 | 386 | ||
387 | sdata = netdev_priv(dev); | 387 | sdata = IEEE802154_DEV_TO_SUB_IF(dev); |
388 | sdata->type = IEEE802154_DEV_WPAN; | 388 | sdata->type = IEEE802154_DEV_WPAN; |
389 | 389 | ||
390 | sdata->chan = MAC802154_CHAN_NONE; | 390 | sdata->chan = MAC802154_CHAN_NONE; |