diff options
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r-- | net/mac80211/cfg.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index d004351050cc..ed5e77ce627b 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
@@ -364,7 +364,7 @@ static int ieee80211_dump_station(struct wiphy *wiphy, struct net_device *dev, | |||
364 | sta = sta_info_get_by_idx(local, idx, dev); | 364 | sta = sta_info_get_by_idx(local, idx, dev); |
365 | if (sta) { | 365 | if (sta) { |
366 | ret = 0; | 366 | ret = 0; |
367 | memcpy(mac, sta->addr, ETH_ALEN); | 367 | memcpy(mac, sta->sta.addr, ETH_ALEN); |
368 | sta_set_sinfo(sta, sinfo); | 368 | sta_set_sinfo(sta, sinfo); |
369 | } | 369 | } |
370 | 370 | ||
@@ -593,7 +593,7 @@ static void ieee80211_send_layer2_update(struct sta_info *sta) | |||
593 | * Update response frame; IEEE Std 802.2-1998, 5.4.1.2.1 */ | 593 | * Update response frame; IEEE Std 802.2-1998, 5.4.1.2.1 */ |
594 | 594 | ||
595 | memset(msg->da, 0xff, ETH_ALEN); | 595 | memset(msg->da, 0xff, ETH_ALEN); |
596 | memcpy(msg->sa, sta->addr, ETH_ALEN); | 596 | memcpy(msg->sa, sta->sta.addr, ETH_ALEN); |
597 | msg->len = htons(6); | 597 | msg->len = htons(6); |
598 | msg->dsap = 0; | 598 | msg->dsap = 0; |
599 | msg->ssap = 0x01; /* NULL LSAP, CR Bit: Response */ | 599 | msg->ssap = 0x01; /* NULL LSAP, CR Bit: Response */ |
@@ -648,9 +648,9 @@ static void sta_apply_parameters(struct ieee80211_local *local, | |||
648 | */ | 648 | */ |
649 | 649 | ||
650 | if (params->aid) { | 650 | if (params->aid) { |
651 | sta->aid = params->aid; | 651 | sta->sta.aid = params->aid; |
652 | if (sta->aid > IEEE80211_MAX_AID) | 652 | if (sta->sta.aid > IEEE80211_MAX_AID) |
653 | sta->aid = 0; /* XXX: should this be an error? */ | 653 | sta->sta.aid = 0; /* XXX: should this be an error? */ |
654 | } | 654 | } |
655 | 655 | ||
656 | if (params->listen_interval >= 0) | 656 | if (params->listen_interval >= 0) |
@@ -919,7 +919,7 @@ static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop, | |||
919 | struct mpath_info *pinfo) | 919 | struct mpath_info *pinfo) |
920 | { | 920 | { |
921 | if (mpath->next_hop) | 921 | if (mpath->next_hop) |
922 | memcpy(next_hop, mpath->next_hop->addr, ETH_ALEN); | 922 | memcpy(next_hop, mpath->next_hop->sta.addr, ETH_ALEN); |
923 | else | 923 | else |
924 | memset(next_hop, 0, ETH_ALEN); | 924 | memset(next_hop, 0, ETH_ALEN); |
925 | 925 | ||