Re: [PATCH 3/3] staging: vt6655: fix checkpatch bracing issues

[Guido Martínez]

On Tue, Apr 01, 2014 at 05:13:02PM +0300, Dan Carpenter wrote:
> On Tue, Apr 01, 2014 at 09:52:13AM -0300, Guido Martínez wrote:
> > @@ -4285,14 +4252,9 @@ vMgrRxManagePacket(
> >  
> >  	case WLAN_FSTYPE_BEACON:
> >  		// Frame Clase = 0
> > -<<<<<<< HEAD
> > -		//DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx beacon\n");
> > -		if (pMgmt->eScanState != WMAC_NO_SCANNING) {
> > -=======
> >  		if (pMgmt->eScanState != WMAC_NO_SCANNING)
> > ->>>>>>> f3c59ed... staging: vt6655: remove dead code
> >  			bInScan = true;
> > -		}
> > +
> >  		s_vMgrRxBeacon(pDevice, pMgmt, pRxPacket, bInScan);
> >  		break;
> >  
> > @@ -4357,16 +4319,11 @@ bMgrPrepareBeaconToSend(
> >  	PSDevice            pDevice = (PSDevice)hDeviceContext;
> >  	PSTxMgmtPacket      pTxPacket;
> >  
> > -<<<<<<< HEAD
> > -//    pDevice->bBeaconBufReady = false;
> > -	if (pDevice->bEncryptionEnable || pDevice->bEnable8021x) {
> > -=======
> >  	if (pDevice->bEncryptionEnable || pDevice->bEnable8021x)
> > ->>>>>>> f3c59ed... staging: vt6655: remove dead code
> >  		pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_PRIVACY(1);
> > -	} else {
> > +	else
> >  		pMgmt->wCurrCapInfo &= ~WLAN_SET_CAP_INFO_PRIVACY(1);
> > -	}
> > +
> 
> Wat?

I seem to have messed up my rebase. Sorry about that. I'll send a v2
fixing this and with your suggestions applied.

Thanks,

-- 
Guido Martínez, VanguardiaSur
www.vanguardiasur.com.ar
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/