Staging: rtl8187se: Fix typos. (ed2cb4f3) · Commits · 戴 / test

drivers/staging/rtl8187se/ieee80211/dot11d.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ Dot11d_Reset(struct ieee80211_device *ieee)

		//
		// Description:
		// Update country IE from Beacon or Probe Resopnse
		// Update country IE from Beacon or Probe Response
		// and configure PHY for operation in the regulatory domain.
		//
		// TODO:

drivers/staging/rtl8187se/ieee80211/ieee80211.h

+7 −7

Original line number	Diff line number	Diff line
		@@ -834,7 +834,7 @@ enum ieee80211_state {
		/* the association procedure is sending AUTH request*/
		IEEE80211_ASSOCIATING_AUTHENTICATING,

		/* the association procedure has successfully authentcated
		/* the association procedure has successfully authenticated
		* and is sending association request
		*/
		IEEE80211_ASSOCIATING_AUTHENTICATED,
		@@ -934,7 +934,7 @@ struct ieee80211_device {
		* with RX of broad/multicast frames */

		/* Fragmentation structures */
		// each streaming contain a entry
		/* each stream contains an entry */
		struct ieee80211_frag_entry frag_cache[17][IEEE80211_FRAG_CACHE_LEN];
		unsigned int frag_next_idx[17];
		u16 fts; /* Fragmentation Threshold */
		@@ -972,7 +972,7 @@ struct ieee80211_device {

		int rate; /* current rate */
		int basic_rate;
		//FIXME: pleace callback, see if redundant with softmac_features
		//FIXME: please callback, see if redundant with softmac_features
		short active_scan;

		/* this contains flags for selectively enable softmac support */
		@@ -1106,7 +1106,7 @@ struct ieee80211_device {

		/* used instead of hard_start_xmit (not softmac_hard_start_xmit)
		* if the IEEE_SOFTMAC_TX_QUEUE feature is used to TX data
		* frames. I the option IEEE_SOFTMAC_SINGLE_QUEUE is also set
		* frames. If the option IEEE_SOFTMAC_SINGLE_QUEUE is also set
		* then also management frames are sent via this callback.
		* This function can't sleep.
		*/
		@@ -1124,7 +1124,7 @@ struct ieee80211_device {

		/* ask to the driver to retune the radio .
		* This function can sleep. the driver should ensure
		* the radio has been swithced before return.
		* the radio has been switched before return.
		*/
		void (set_chan)(struct net_device dev,short ch);

		@@ -1135,7 +1135,7 @@ struct ieee80211_device {
		* The syncro version is similar to the start_scan but
		* does not return until all channels has been scanned.
		* this is called in user context and should sleep,
		* it is called in a work_queue when swithcing to ad-hoc mode
		* it is called in a work_queue when switching to ad-hoc mode
		* or in behalf of iwlist scan when the card is associated
		* and root user ask for a scan.
		* the function stop_scan should stop both the syncro and
		@@ -1196,7 +1196,7 @@ struct ieee80211_device {
		/* Generate probe requests */
		#define IEEE_SOFTMAC_PROBERQ (1<<4)

		/* Generate respones to probe requests */
		/* Generate response to probe requests */
		#define IEEE_SOFTMAC_PROBERS (1<<5)

		/* The ieee802.11 stack will manages the netif queue

drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ short ieee80211_is_shortslot(const struct ieee80211_network *net)
		return net->capability & WLAN_CAPABILITY_SHORT_SLOT;
		}

		/* returns the total length needed for pleacing the RATE MFIE
		/* returns the total length needed for placing the RATE MFIE
		* tag and the EXTENDED RATE MFIE tag if needed.
		* It encludes two bytes per tag for the tag itself and its len
		*/
		@@ -60,7 +60,7 @@ unsigned int ieee80211_MFIE_rate_len(struct ieee80211_device *ieee)
		return rate_len;
		}

		/* pleace the MFIE rate, tag to the memory (double) poined.
		/* place the MFIE rate, tag to the memory (double) poised.
		* Then it updates the pointer so that
		* it points after the new MFIE tag added.
		*/
		@@ -467,7 +467,7 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee)
		* So we switch to IEEE80211_LINKED_SCANNING to remember
		* that we are still logically linked (not interested in
		* new network events, despite for updating the net list,
		* but we are temporarly 'unlinked' as the driver shall
		* but we are temporarily 'unlinked' as the driver shall
		* not filter RX frames and the channel is changing.
		* So the only situation in witch are interested is to check
		* if the state become LINKED because of the #1 situation
		@@ -530,7 +530,7 @@ void ieee80211_softmac_ips_scan_syncro(struct ieee80211_device *ieee)
		* So we switch to IEEE80211_LINKED_SCANNING to remember
		* that we are still logically linked (not interested in
		* new network events, despite for updating the net list,
		* but we are temporarly 'unlinked' as the driver shall
		* but we are temporarily 'unlinked' as the driver shall
		* not filter RX frames and the channel is changing.
		* So the only situation in witch are interested is to check
		* if the state become LINKED because of the #1 situation
		@@ -1140,7 +1140,7 @@ void ieee80211_associate_abort(struct ieee80211_device *ieee)

		ieee->associate_seq++;

		/* don't scan, and avoid to have the RX path possibily
		/* don't scan, and avoid to have the RX path possibly
		* try again to associate. Even do not react to AUTH or
		* ASSOC response. Just wait for the retry wq to be scheduled.
		* Here we will check if there are good nets to associate
		@@ -1346,14 +1346,14 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee
		//printk("apset=%d apmatch=%d ssidset=%d ssidbroad=%d ssidmatch=%d\n",apset,apmatch,ssidset,ssidbroad,ssidmatch);

		if ( /* if the user set the AP check if match.
		* if the network does not broadcast essid we check the user supplyed ANY essid
		* if the network does not broadcast essid we check the user supplied ANY essid
		* if the network does broadcast and the user does not set essid it is OK
		* if the network does broadcast and the user did set essid chech if essid match
		*/
		( apset && apmatch &&
		((ssidset && ssidbroad && ssidmatch) \|\| (ssidbroad && !ssidset) \|\| (!ssidbroad && ssidset)) ) \|\|
		/* if the ap is not set, check that the user set the bssid
		* and the network does bradcast and that those two bssid matches
		* and the network does broadcast and that those two bssid matches
		*/
		(!apset && ssidset && ssidbroad && ssidmatch)
		){
		@@ -1821,7 +1821,7 @@ ieee80211_rx_frame_softmac(struct ieee80211_device ieee, struct sk_buff skb,

		while (left >= sizeof(struct ieee80211_info_element_hdr)) {
		if (sizeof(struct ieee80211_info_element_hdr) + info_element->len > left) {
		printk(KERN_WARNING "[re]associate reeponse error!");
		printk(KERN_WARNING "[re]associate response error!");
		return 1;
		}
		switch (info_element->id) {
		@@ -2184,15 +2184,15 @@ void ieee80211_start_ibss_wq(struct work_struct *work)

		if(ieee->state == IEEE80211_NOLINK)
		ieee->current_network.channel = 10;
		/* if not then the state is not linked. Maybe the user swithced to
		/* if not then the state is not linked. Maybe the user switched to
		* ad-hoc mode just after being in monitor mode, or just after
		* being very few time in managed mode (so the card have had no
		* time to scan all the chans..) or we have just run up the iface
		* after setting ad-hoc mode. So we have to give another try..
		* Here, in ibss mode, should be safe to do this without extra care
		* (in bss mode we had to make sure no-one tryed to associate when
		* (in bss mode we had to make sure no-one tried to associate when
		* we had just checked the ieee->state and we was going to start the
		* scan) beacause in ibss mode the ieee80211_new_net function, when
		* scan) because in ibss mode the ieee80211_new_net function, when
		* finds a good net, just set the ieee->state to IEEE80211_LINKED,
		* so, at worst, we waste a bit of time to initiate an unneeded syncro
		* scan, that will stop at the first round because it sees the state
		@@ -2342,7 +2342,7 @@ void ieee80211_associate_retry_wq(struct work_struct *work)
		goto exit;
		/* until we do not set the state to IEEE80211_NOLINK
		* there are no possibility to have someone else trying
		* to start an association procdure (we get here with
		* to start an association procedure (we get here with
		* ieee->state = IEEE80211_ASSOCIATING).
		* When we set the state to IEEE80211_NOLINK it is possible
		* that the RX path run an attempt to associate, but

drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -362,7 +362,7 @@ int ieee80211_wx_set_essid(struct ieee80211_device *ieee,
		ieee80211_stop_protocol(ieee);

		/* this is just to be sure that the GET wx callback
		* has consisten infos. not needed otherwise
		* has consistent infos. not needed otherwise
		*/
		spin_lock_irqsave(&ieee->lock, flags);

drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -328,7 +328,7 @@ int ieee80211_rtl_xmit(struct sk_buff *skb,
		//printk(KERN_WARNING "upper layer packet!\n");
		spin_lock_irqsave(&ieee->lock, flags);

		/* If there is no driver handler to take the TXB, dont' bother
		/* If there is no driver handler to take the TXB, don't bother
		* creating it... */
		if ((!ieee->hard_start_xmit && !(ieee->softmac_features & IEEE_SOFTMAC_TX_QUEUE))\|\|
		((!ieee->softmac_data_hard_start_xmit && (ieee->softmac_features & IEEE_SOFTMAC_TX_QUEUE)))) {

Admin message