Kalle Valo <kvalo@xxxxxxxxxxxxxx> writes:
>> From: Troy Tan <troy_tan@xxxxxxxxxxxxxx>
>>
>> When the buffer descriptor index exceeds 2, then a TX HANG condition
>> will result.
>>
>> Signed-off-by: Troy Tan <troy_tan@xxxxxxxxxxxxxx>
>> Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
>> Cc: Stable <stable@xxxxxxxxxxxxxxx> [V3.18]
>
> Thanks, 4 patches applied to wireless-drivers-next.git:
>
> b661a5da5776 rtlwifi: rtl8192ee: Fix adhoc fail
> 6e5f44361628 rtlwifi: rtl8192ee: Fix TX hang due to failure to update TX write point
> 92ff754240b8 rtlwifi: rtl8192ee: Fix parsing of received packet
> 21b39ddb5bb2 rtlwifi: rtl8192ee: Fix DMA stalls
>
> 3 patches skipped:
I had to skip these three patches because of my mistake. So what I did
was that I had merged ("fast forwarded") the net tree into my
wireless-drivers tree and not realising I should not do that. So now I
can't merge wireless-drivers into wireless-drivers-next anymore, as it
will pull unnecessary net changes.
> [V2,for,3.19,1/7] rtlwifi: Remove logging statement that is no longer
> needed
I'll apply this after 3.20-rc1 is released, it should apply then without
problems (or the conflicts are easy for me to fix). Luckily this is just
a cosmetic error and can wait for 3.20-rc2, right?
> [V2,for,3.19,2/7] rtlwifi: rtl8192ee: Fix handling of new style descriptors
> [V2,for,3.19,6/7] rtlwifi: rtl8192ee: Fix problems with calculating free space in FIFO
Not sure what to do with these one. Should you rebase and send them now?
--
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html