On Tue, Mar 01, 2011 at 11:09:58AM +0100, Arend van Spriel wrote: > On Tue, 01 Mar 2011 10:56:57 +0100, Arend van Spriel > Should have used the -M option again :-( Please discard this patch > and I will send a replacement patch. > The reason it doesn't apply is because you've got a patch merged in your tree that isn't included in staging-next. Javier Martinez was going to just chop out all the #if 0 code but on your branch you replaced it with rx_status->flag |= RX_FLAG_TSFT; @@ -6897,11 +6866,14 @@ - ratespec_t rspec; - unsigned char *plcp; - +-#if 0 +- /* Clearly, this is bogus -- reading the TSF now is wrong */ - wlc_read_tsf(wlc, &tsf_l, &tsf_h); /* mactime */ - rx_status->mactime = tsf_h; - rx_status->mactime <<= 32; - rx_status->mactime |= tsf_l; -- rx_status->flag |= RX_FLAG_TSFT; +- rx_status->flag |= RX_FLAG_MACTIME_MPDU; /* clearly wrong */ +-#endif - - channel = WLC_CHAN_CHANNEL(rxh->RxChan); - @@ -8553,10482 +8525,3 @@ Hopefully the git -m doesn't allow something that regular patch wouldn't. That would be a potential way to sneak changes in without review... We'll see. regards, dan carpenter _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
