diff options
Diffstat (limited to 'drivers/staging/wlan-ng/p80211conv.c')
| -rw-r--r-- | drivers/staging/wlan-ng/p80211conv.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c index dfc7b3a1e9c..342715af82d 100644 --- a/drivers/staging/wlan-ng/p80211conv.c +++ b/drivers/staging/wlan-ng/p80211conv.c | |||
| @@ -198,21 +198,21 @@ int skb_ether_to_p80211( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb | |||
| 198 | 198 | ||
| 199 | switch ( wlandev->macmode ) { | 199 | switch ( wlandev->macmode ) { |
| 200 | case WLAN_MACMODE_IBSS_STA: | 200 | case WLAN_MACMODE_IBSS_STA: |
| 201 | memcpy(p80211_hdr->a3.a1, &e_hdr.daddr, WLAN_ADDR_LEN); | 201 | memcpy(p80211_hdr->a3.a1, &e_hdr.daddr, ETH_ALEN); |
| 202 | memcpy(p80211_hdr->a3.a2, wlandev->netdev->dev_addr, WLAN_ADDR_LEN); | 202 | memcpy(p80211_hdr->a3.a2, wlandev->netdev->dev_addr, ETH_ALEN); |
| 203 | memcpy(p80211_hdr->a3.a3, wlandev->bssid, WLAN_ADDR_LEN); | 203 | memcpy(p80211_hdr->a3.a3, wlandev->bssid, ETH_ALEN); |
| 204 | break; | 204 | break; |
| 205 | case WLAN_MACMODE_ESS_STA: | 205 | case WLAN_MACMODE_ESS_STA: |
| 206 | fc |= host2ieee16(WLAN_SET_FC_TODS(1)); | 206 | fc |= host2ieee16(WLAN_SET_FC_TODS(1)); |
| 207 | memcpy(p80211_hdr->a3.a1, wlandev->bssid, WLAN_ADDR_LEN); | 207 | memcpy(p80211_hdr->a3.a1, wlandev->bssid, ETH_ALEN); |
| 208 | memcpy(p80211_hdr->a3.a2, wlandev->netdev->dev_addr, WLAN_ADDR_LEN); | 208 | memcpy(p80211_hdr->a3.a2, wlandev->netdev->dev_addr, ETH_ALEN); |
| 209 | memcpy(p80211_hdr->a3.a3, &e_hdr.daddr, WLAN_ADDR_LEN); | 209 | memcpy(p80211_hdr->a3.a3, &e_hdr.daddr, ETH_ALEN); |
| 210 | break; | 210 | break; |
| 211 | case WLAN_MACMODE_ESS_AP: | 211 | case WLAN_MACMODE_ESS_AP: |
| 212 | fc |= host2ieee16(WLAN_SET_FC_FROMDS(1)); | 212 | fc |= host2ieee16(WLAN_SET_FC_FROMDS(1)); |
| 213 | memcpy(p80211_hdr->a3.a1, &e_hdr.daddr, WLAN_ADDR_LEN); | 213 | memcpy(p80211_hdr->a3.a1, &e_hdr.daddr, ETH_ALEN); |
| 214 | memcpy(p80211_hdr->a3.a2, wlandev->bssid, WLAN_ADDR_LEN); | 214 | memcpy(p80211_hdr->a3.a2, wlandev->bssid, ETH_ALEN); |
| 215 | memcpy(p80211_hdr->a3.a3, &e_hdr.saddr, WLAN_ADDR_LEN); | 215 | memcpy(p80211_hdr->a3.a3, &e_hdr.saddr, ETH_ALEN); |
| 216 | break; | 216 | break; |
| 217 | default: | 217 | default: |
| 218 | WLAN_LOG_ERROR("Error: Converting eth to wlan in unknown mode.\n"); | 218 | WLAN_LOG_ERROR("Error: Converting eth to wlan in unknown mode.\n"); |