linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] crap/rtl8187se: Fix comment-out-typo
@ 2009-08-09 16:02 Michael Buesch
  2009-08-10 14:59 ` John W. Linville
  0 siblings, 1 reply; 2+ messages in thread
From: Michael Buesch @ 2009-08-09 16:02 UTC (permalink / raw)
  To: gregkh; +Cc: linux-wireless

This fixes a comment-out-typo that resulted in a dangling if-branch.

Signed-off-by: Michael Buesch <mb@bu3sch.de>

---

Completely untested, but looks sane.


 drivers/staging/rtl8187se/r8180_core.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- wireless-testing.orig/drivers/staging/rtl8187se/r8180_core.c
+++ wireless-testing/drivers/staging/rtl8187se/r8180_core.c
@@ -3394,21 +3394,21 @@ short rtl8180_tx(struct net_device *dev,
 			if(remain == 4 && i+4 >= buflen) break;
 			/* ensure the last desc has at least 4 bytes payload */
 
 		}
 		txbuf = txbuf + i;
 		*(tail+3)=*(tail+3) &~ 0xfff;
 		*(tail+3)=*(tail+3) | i; // buffer lenght
 		// Use short preamble or not
 		if (priv->ieee80211->current_network.capability&WLAN_CAPABILITY_SHORT_PREAMBLE)
 			if (priv->plcp_preamble_mode==1 && rate!=0)	//  short mode now, not long!
-			//	*tail |= (1<<16);				// enable short preamble mode.
+			;//	*tail |= (1<<16);				// enable short preamble mode.
 
 #ifdef CONFIG_RTL8185B
 		if(bCTSEnable) {
 			*tail |= (1<<18);
 		}
 
 		if(bRTSEnable) //rts enable
 		{
 			*tail |= ((ieeerate2rtlrate(priv->ieee80211->basic_rate))<<19);//RTS RATE
 			*tail |= (1<<23);//rts enable

-- 
Greetings, Michael.

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] crap/rtl8187se: Fix comment-out-typo
  2009-08-09 16:02 [PATCH] crap/rtl8187se: Fix comment-out-typo Michael Buesch
@ 2009-08-10 14:59 ` John W. Linville
  0 siblings, 0 replies; 2+ messages in thread
From: John W. Linville @ 2009-08-10 14:59 UTC (permalink / raw)
  To: Michael Buesch; +Cc: gregkh, linux-wireless

On Sun, Aug 09, 2009 at 06:02:30PM +0200, Michael Buesch wrote:
> This fixes a comment-out-typo that resulted in a dangling if-branch.
> 
> Signed-off-by: Michael Buesch <mb@bu3sch.de>
> 
> ---
> 
> Completely untested, but looks sane.
> 
> 
>  drivers/staging/rtl8187se/r8180_core.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- wireless-testing.orig/drivers/staging/rtl8187se/r8180_core.c
> +++ wireless-testing/drivers/staging/rtl8187se/r8180_core.c
> @@ -3394,21 +3394,21 @@ short rtl8180_tx(struct net_device *dev,
>  			if(remain == 4 && i+4 >= buflen) break;
>  			/* ensure the last desc has at least 4 bytes payload */
>  
>  		}
>  		txbuf = txbuf + i;
>  		*(tail+3)=*(tail+3) &~ 0xfff;
>  		*(tail+3)=*(tail+3) | i; // buffer lenght
>  		// Use short preamble or not
>  		if (priv->ieee80211->current_network.capability&WLAN_CAPABILITY_SHORT_PREAMBLE)
>  			if (priv->plcp_preamble_mode==1 && rate!=0)	//  short mode now, not long!
> -			//	*tail |= (1<<16);				// enable short preamble mode.
> +			;//	*tail |= (1<<16);				// enable short preamble mode.
>  
>  #ifdef CONFIG_RTL8185B
>  		if(bCTSEnable) {
>  			*tail |= (1<<18);
>  		}
>  
>  		if(bRTSEnable) //rts enable
>  		{
>  			*tail |= ((ieeerate2rtlrate(priv->ieee80211->basic_rate))<<19);//RTS RATE
>  			*tail |= (1<<23);//rts enable

Thanks for the reminder of why rtl8187se remains abandoned...

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-08-10 15:01 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-08-09 16:02 [PATCH] crap/rtl8187se: Fix comment-out-typo Michael Buesch
2009-08-10 14:59 ` John W. Linville

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).