diff options
Diffstat (limited to 'net/ieee80211/ieee80211_tx.c')
-rw-r--r-- | net/ieee80211/ieee80211_tx.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c index c9aaff3fea1e..1a09448016ed 100644 --- a/net/ieee80211/ieee80211_tx.c +++ b/net/ieee80211/ieee80211_tx.c | |||
@@ -285,8 +285,8 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) | |||
285 | } | 285 | } |
286 | 286 | ||
287 | /* Save source and destination addresses */ | 287 | /* Save source and destination addresses */ |
288 | memcpy(&dest, skb->data, ETH_ALEN); | 288 | memcpy(dest, skb->data, ETH_ALEN); |
289 | memcpy(&src, skb->data + ETH_ALEN, ETH_ALEN); | 289 | memcpy(src, skb->data + ETH_ALEN, ETH_ALEN); |
290 | 290 | ||
291 | /* Advance the SKB to the start of the payload */ | 291 | /* Advance the SKB to the start of the payload */ |
292 | skb_pull(skb, sizeof(struct ethhdr)); | 292 | skb_pull(skb, sizeof(struct ethhdr)); |
@@ -304,15 +304,15 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) | |||
304 | fc |= IEEE80211_FCTL_TODS; | 304 | fc |= IEEE80211_FCTL_TODS; |
305 | /* To DS: Addr1 = BSSID, Addr2 = SA, | 305 | /* To DS: Addr1 = BSSID, Addr2 = SA, |
306 | Addr3 = DA */ | 306 | Addr3 = DA */ |
307 | memcpy(&header.addr1, ieee->bssid, ETH_ALEN); | 307 | memcpy(header.addr1, ieee->bssid, ETH_ALEN); |
308 | memcpy(&header.addr2, &src, ETH_ALEN); | 308 | memcpy(header.addr2, src, ETH_ALEN); |
309 | memcpy(&header.addr3, &dest, ETH_ALEN); | 309 | memcpy(header.addr3, dest, ETH_ALEN); |
310 | } else if (ieee->iw_mode == IW_MODE_ADHOC) { | 310 | } else if (ieee->iw_mode == IW_MODE_ADHOC) { |
311 | /* not From/To DS: Addr1 = DA, Addr2 = SA, | 311 | /* not From/To DS: Addr1 = DA, Addr2 = SA, |
312 | Addr3 = BSSID */ | 312 | Addr3 = BSSID */ |
313 | memcpy(&header.addr1, dest, ETH_ALEN); | 313 | memcpy(header.addr1, dest, ETH_ALEN); |
314 | memcpy(&header.addr2, src, ETH_ALEN); | 314 | memcpy(header.addr2, src, ETH_ALEN); |
315 | memcpy(&header.addr3, ieee->bssid, ETH_ALEN); | 315 | memcpy(header.addr3, ieee->bssid, ETH_ALEN); |
316 | } | 316 | } |
317 | header.frame_ctl = cpu_to_le16(fc); | 317 | header.frame_ctl = cpu_to_le16(fc); |
318 | hdr_len = IEEE80211_3ADDR_LEN; | 318 | hdr_len = IEEE80211_3ADDR_LEN; |