On 31.03.2019 20:13, David Miller wrote:
> From: Heiner Kallweit <hkallwe...@gmail.com>
> Date: Sun, 31 Mar 2019 15:43:59 +0200
>
>> @@ -5456,12 +5448,6 @@ static void rtl_hw_start_8168(struct rtl8169_private
>> *tp)
>> {
>> RTL_W8(tp, MaxTxPacketSize, TxPacketMax);
>>
>> - tp->cp_cmd &= ~INTT_MASK;
>> - tp->cp_cmd |= PktCntrDisable | INTT_1;
>> - RTL_W16(tp, CPlusCmd, tp->cp_cmd);
>> -
>> - RTL_W16(tp, IntrMitigate, 0x5100);
>> -
>> /* Work around for RxFIFO overflow. */
>
> This patch isn't against net-next.
>
> I'm guessing it's against a tree with the RX coalesce disable changes
> applied.
>
You're right, sorry. It will apply cleanly only once net has been merged
into net-next. However, if I rebase this patch to net-next, then merging
net to net-next will complain. Can we defer applying this patch until net
has been merged?
