| Message ID | 200908091802.31166.mb@bu3sch.de (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
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...
--- 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
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(-)