replace net_device arguments with ieee80211_{local,sub_if_data} as appropriate

[mv-sheeva.git] / net / mac80211 / tx.c

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 85f3ba85c132297d9b92770e480b7918a9bfbc93..c413d4836afecb24aca8120ceec0c780c38abf0d 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1327,7 +1327,7 @@ int ieee80211_master_start_xmit(struct sk_buff *skb,
                        if (is_multicast_ether_addr(hdr->addr3))
                                memcpy(hdr->addr1, hdr->addr3, ETH_ALEN);
                        else
-                               if (mesh_nexthop_lookup(skb, odev))
+                               if (mesh_nexthop_lookup(skb, osdata))
                                        return  0;
                        if (memcmp(odev->dev_addr, hdr->addr4, ETH_ALEN) != 0)
                                IEEE80211_IFSTA_MESH_CTR_INC(&osdata->u.sta,
@@ -1908,7 +1908,7 @@ struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
                *pos++ = WLAN_EID_SSID;
                *pos++ = 0x0;
 
-               mesh_mgmt_ies_add(skb, sdata->dev);
+               mesh_mgmt_ies_add(skb, sdata);
 
                num_beacons = &sdata->u.sta.num_beacons;
        } else {