tx.c (88c868c43ba38ac3bab07bab4c45b4bc44c94357) tx.c (dbf498fbafa2c23139d5a990e94ed78bafbbea19)
1/*
2 * Copyright 2002-2005, Instant802 Networks, Inc.
3 * Copyright 2005-2006, Devicescape Software, Inc.
4 * Copyright 2006-2007 Jiri Benc <jbenc@suse.cz>
5 * Copyright 2007 Johannes Berg <johannes@sipsolutions.net>
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License version 2 as

--- 2359 unchanged lines hidden (view full) ---

2368 if (!skb)
2369 goto out;
2370
2371 hdr = (struct ieee80211_hdr *) skb->data;
2372 hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
2373 IEEE80211_STYPE_BEACON);
2374 } else if (ieee80211_vif_is_mesh(&sdata->vif)) {
2375 struct ieee80211_mgmt *mgmt;
1/*
2 * Copyright 2002-2005, Instant802 Networks, Inc.
3 * Copyright 2005-2006, Devicescape Software, Inc.
4 * Copyright 2006-2007 Jiri Benc <jbenc@suse.cz>
5 * Copyright 2007 Johannes Berg <johannes@sipsolutions.net>
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License version 2 as

--- 2359 unchanged lines hidden (view full) ---

2368 if (!skb)
2369 goto out;
2370
2371 hdr = (struct ieee80211_hdr *) skb->data;
2372 hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
2373 IEEE80211_STYPE_BEACON);
2374 } else if (ieee80211_vif_is_mesh(&sdata->vif)) {
2375 struct ieee80211_mgmt *mgmt;
2376 struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
2376 u8 *pos;
2377 int hdr_len = offsetof(struct ieee80211_mgmt, u.beacon) +
2378 sizeof(mgmt->u.beacon);
2379
2380#ifdef CONFIG_MAC80211_MESH
2381 if (!sdata->u.mesh.mesh_id_len)
2382 goto out;
2383#endif
2384
2377 u8 *pos;
2378 int hdr_len = offsetof(struct ieee80211_mgmt, u.beacon) +
2379 sizeof(mgmt->u.beacon);
2380
2381#ifdef CONFIG_MAC80211_MESH
2382 if (!sdata->u.mesh.mesh_id_len)
2383 goto out;
2384#endif
2385
2386 if (ifmsh->sync_ops)
2387 ifmsh->sync_ops->adjust_tbtt(
2388 sdata);
2389
2385 skb = dev_alloc_skb(local->tx_headroom +
2386 hdr_len +
2387 2 + /* NULL SSID */
2388 2 + 8 + /* supported rates */
2389 2 + 3 + /* DS params */
2390 2 + (IEEE80211_MAX_SUPP_RATES - 8) +
2391 2 + sizeof(struct ieee80211_ht_cap) +
2392 2 + sizeof(struct ieee80211_ht_operation) +

--- 335 unchanged lines hidden --- 		2390 skb = dev_alloc_skb(local->tx_headroom +
2391 hdr_len +
2392 2 + /* NULL SSID */
2393 2 + 8 + /* supported rates */
2394 2 + 3 + /* DS params */
2395 2 + (IEEE80211_MAX_SUPP_RATES - 8) +
2396 2 + sizeof(struct ieee80211_ht_cap) +
2397 2 + sizeof(struct ieee80211_ht_operation) +

--- 335 unchanged lines hidden ---