lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: clean up some comments

Browse Source 
Some comments refer to 80211.o or similar; also remove
a comment about implementing fragments better, we really
have better things to do.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg
2008-09-11 00:01:56 +02:00
committed by John W. Linville
parent c2b13452b2
commit ccd7b36286
4 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/mac80211/ieee80211_i.h
View File

@@ -29,9 +29,6 @@
#include "key.h" #include "key.h"
#include "sta_info.h" #include "sta_info.h"
/* ieee80211.o internal definitions, etc. These are not included into
* low-level drivers. */
struct ieee80211_local; struct ieee80211_local;
/* Maximum number of broadcast/multicast frames to buffer when some of the /* Maximum number of broadcast/multicast frames to buffer when some of the
@@ -293,13 +290,13 @@ struct mesh_config {
#define IEEE80211_STA_AUTO_BSSID_SEL BIT(11) #define IEEE80211_STA_AUTO_BSSID_SEL BIT(11)
#define IEEE80211_STA_AUTO_CHANNEL_SEL BIT(12) #define IEEE80211_STA_AUTO_CHANNEL_SEL BIT(12)
#define IEEE80211_STA_PRIVACY_INVOKED BIT(13) #define IEEE80211_STA_PRIVACY_INVOKED BIT(13)
/* flags for MLME request*/ /* flags for MLME request */
#define IEEE80211_STA_REQ_SCAN 0 #define IEEE80211_STA_REQ_SCAN 0
#define IEEE80211_STA_REQ_DIRECT_PROBE 1 #define IEEE80211_STA_REQ_DIRECT_PROBE 1
#define IEEE80211_STA_REQ_AUTH 2 #define IEEE80211_STA_REQ_AUTH 2
#define IEEE80211_STA_REQ_RUN 3 #define IEEE80211_STA_REQ_RUN 3
/* flags used for setting mlme state */ /* STA/IBSS MLME states */
enum ieee80211_sta_mlme_state { enum ieee80211_sta_mlme_state {
IEEE80211_STA_MLME_DISABLED, IEEE80211_STA_MLME_DISABLED,
IEEE80211_STA_MLME_DIRECT_PROBE, IEEE80211_STA_MLME_DIRECT_PROBE,

4
net/mac80211/rx.c
View File

@@ -501,8 +501,8 @@ ieee80211_rx_h_check(struct ieee80211_rx_data *rx)
/* Drop disallowed frame classes based on STA auth/assoc state; /* Drop disallowed frame classes based on STA auth/assoc state;
* IEEE 802.11, Chap 5.5. * IEEE 802.11, Chap 5.5.
* *
* 80211.o does filtering only based on association state, i.e., it * mac80211 filters only based on association state, i.e. it drops
* drops Class 3 frames from not associated stations. hostapd sends * Class 3 frames from not associated stations. hostapd sends
* deauth/disassoc frames when needed. In addition, hostapd is * deauth/disassoc frames when needed. In addition, hostapd is
* responsible for filtering on both auth and assoc states. * responsible for filtering on both auth and assoc states.
*/ */

15
net/mac80211/tx.c
View File

@@ -111,7 +111,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, int group_addr,
hdr = (struct ieee80211_hdr *)tx->skb->data; hdr = (struct ieee80211_hdr *)tx->skb->data;
if (ieee80211_is_ctl(hdr->frame_control)) { if (ieee80211_is_ctl(hdr->frame_control)) {
/* TODO: These control frames are not currently sent by /* TODO: These control frames are not currently sent by
* 80211.o, but should they be implemented, this function * mac80211, but should they be implemented, this function
* needs to be updated to support duration field calculation. * needs to be updated to support duration field calculation.
* *
* RTS: time needed to transmit pending data/mgmt frame plus * RTS: time needed to transmit pending data/mgmt frame plus
@@ -1580,19 +1580,6 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb,
nh_pos -= skip_header_bytes; nh_pos -= skip_header_bytes;
h_pos -= skip_header_bytes; h_pos -= skip_header_bytes;
/* TODO: implement support for fragments so that there is no need to
* reallocate and copy payload; it might be enough to support one
* extra fragment that would be copied in the beginning of the frame
* data.. anyway, it would be nice to include this into skb structure
* somehow
*
* There are few options for this:
* use skb->cb as an extra space for 802.11 header
* allocate new buffer if not enough headroom
* make sure that there is enough headroom in every skb by increasing
* build in headroom in __dev_alloc_skb() (linux/skbuff.h) and
* alloc_skb() (net/core/skbuff.c)
*/
head_need = hdrlen + encaps_len + meshhdrlen - skb_headroom(skb); head_need = hdrlen + encaps_len + meshhdrlen - skb_headroom(skb);
/* /*

1
net/mac80211/wme.h
View File

@@ -1,5 +1,4 @@
/* /*
* IEEE 802.11 driver (80211.o) - QoS datatypes
* Copyright 2004, Instant802 Networks, Inc. * Copyright 2004, Instant802 Networks, Inc.
* Copyright 2005, Devicescape Software, Inc. * Copyright 2005, Devicescape Software, Inc.
* *