Skip to content

Commit

Permalink
mac802154: rename mac802154_priv to ieee802154_local
Browse files Browse the repository at this point in the history
This patch rename the mac802154_priv to ieee802154_local. The
mac802154_priv structure is like ieee80211_local and so we name it
ieee802154_local.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Alexander Aring authored and Marcel Holtmann committed Oct 25, 2014
1 parent 5a50439 commit a5e1ec5
Show file tree
Hide file tree
Showing 7 changed files with 130 additions and 131 deletions.
12 changes: 6 additions & 6 deletions net/mac802154/ieee802154_i.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "llsec.h"

/* mac802154 device private data */
struct mac802154_priv {
struct ieee802154_local {
struct ieee802154_hw hw;
struct ieee802154_ops *ops;

Expand Down Expand Up @@ -69,7 +69,7 @@ struct mac802154_priv {
struct mac802154_sub_if_data {
struct list_head list; /* the ieee802154_priv->slaves list */

struct mac802154_priv *hw;
struct ieee802154_local *hw;
struct net_device *dev;

int type;
Expand Down Expand Up @@ -99,7 +99,7 @@ struct mac802154_sub_if_data {
struct mac802154_llsec sec;
};

#define mac802154_to_priv(_hw) container_of(_hw, struct mac802154_priv, hw)
#define mac802154_to_priv(_hw) container_of(_hw, struct ieee802154_local, hw)

#define MAC802154_CHAN_NONE 0xff /* No channel is assigned */

Expand All @@ -109,13 +109,13 @@ extern struct ieee802154_mlme_ops mac802154_mlme_wpan;
int mac802154_slave_open(struct net_device *dev);
int mac802154_slave_close(struct net_device *dev);

void mac802154_monitors_rx(struct mac802154_priv *priv, struct sk_buff *skb);
void mac802154_monitors_rx(struct ieee802154_local *local, struct sk_buff *skb);
void mac802154_monitor_setup(struct net_device *dev);

void mac802154_wpans_rx(struct mac802154_priv *priv, struct sk_buff *skb);
void mac802154_wpans_rx(struct ieee802154_local *local, struct sk_buff *skb);
void mac802154_wpan_setup(struct net_device *dev);

netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb,
netdev_tx_t mac802154_tx(struct ieee802154_local *local, struct sk_buff *skb,
u8 page, u8 chan);

/* MIB callbacks */
Expand Down
4 changes: 2 additions & 2 deletions net/mac802154/iface.c
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ static int mac802154_parse_frame_start(struct sk_buff *skb,
return 0;
}

void mac802154_wpans_rx(struct mac802154_priv *priv, struct sk_buff *skb)
void mac802154_wpans_rx(struct ieee802154_local *local, struct sk_buff *skb)
{
int ret;
struct mac802154_sub_if_data *sdata;
Expand All @@ -579,7 +579,7 @@ void mac802154_wpans_rx(struct mac802154_priv *priv, struct sk_buff *skb)
}

rcu_read_lock();
list_for_each_entry_rcu(sdata, &priv->slaves, list) {
list_for_each_entry_rcu(sdata, &local->slaves, list) {
if (sdata->type != IEEE802154_DEV_WPAN ||
!netif_running(sdata->dev))
continue;
Expand Down
Loading

0 comments on commit a5e1ec5

Please sign in to comment.