Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccd7b362 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: clean up some comments 



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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c2b13452

net/mac80211/ieee80211_i.h

+2 −5
Original line number Diff line number Diff line
@@ -29,9 +29,6 @@ 
#include "key.h"

#include "sta_info.h"



/* ieee80211.o internal definitions, etc. These are not included into

 * low-level drivers. */



struct ieee80211_local;



/* Maximum number of broadcast/multicast frames to buffer when some of the
@@ -299,7 +296,7 @@ struct mesh_config { 
#define IEEE80211_STA_REQ_AUTH 2

#define IEEE80211_STA_REQ_RUN  3



/* flags used for setting mlme state */

/* STA/IBSS MLME states */

enum ieee80211_sta_mlme_state {

	IEEE80211_STA_MLME_DISABLED,

	IEEE80211_STA_MLME_DIRECT_PROBE,

net/mac80211/rx.c

+2 −2
Original line number Diff line number Diff line
@@ -501,8 +501,8 @@ ieee80211_rx_h_check(struct ieee80211_rx_data *rx) 
	/* Drop disallowed frame classes based on STA auth/assoc state;

	 * IEEE 802.11, Chap 5.5.

	 *

	 * 80211.o does filtering only based on association state, i.e., it

	 * drops Class 3 frames from not associated stations. hostapd sends

	 * mac80211 filters only based on association state, i.e. it drops

	 * Class 3 frames from not associated stations. hostapd sends

	 * deauth/disassoc frames when needed. In addition, hostapd is

	 * responsible for filtering on both auth and assoc states.

	 */

net/mac80211/tx.c

+1 −14
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, int group_addr, 
	hdr = (struct ieee80211_hdr *)tx->skb->data;

	if (ieee80211_is_ctl(hdr->frame_control)) {

		/* 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.

		 *

		 * 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;

	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);



	/*

net/mac80211/wme.h

+0 −1
Original line number Diff line number Diff line 
/*

 * IEEE 802.11 driver (80211.o) - QoS datatypes

 * Copyright 2004, Instant802 Networks, Inc.

 * Copyright 2005, Devicescape Software, Inc.

 *