| Message ID | 20200305175651.4563-5-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/net: Make Net/CanBus can_receive() handlers return a boolean | expand |
On Thu, Mar 5, 2020 at 9:59 AM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > We will modify this code in the next commit. Clean it up > first to avoid checkpatch.pl errors. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/net/rtl8139.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c > index ef3211537f..be9a0af629 100644 > --- a/hw/net/rtl8139.c > +++ b/hw/net/rtl8139.c > @@ -799,10 +799,12 @@ static int rtl8139_can_receive(NetClientState *nc) > int avail; > > /* Receive (drop) packets if card is disabled. */ > - if (!s->clock_enabled) > - return 1; > - if (!rtl8139_receiver_enabled(s)) > - return 1; > + if (!s->clock_enabled) { > + return 1; > + } > + if (!rtl8139_receiver_enabled(s)) { > + return 1; > + } > > if (rtl8139_cp_receiver_enabled(s) && rtl8139_cp_rx_valid(s)) { > /* ??? Flow control not implemented in c+ mode. > -- > 2.21.1 > >
On 3/5/20 6:56 PM, Philippe Mathieu-Daudé wrote: > We will modify this code in the next commit. Clean it up > first to avoid checkpatch.pl errors. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> > --- > hw/net/rtl8139.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c > index ef3211537f..be9a0af629 100644 > --- a/hw/net/rtl8139.c > +++ b/hw/net/rtl8139.c > @@ -799,10 +799,12 @@ static int rtl8139_can_receive(NetClientState *nc) > int avail; > > /* Receive (drop) packets if card is disabled. */ > - if (!s->clock_enabled) > - return 1; > - if (!rtl8139_receiver_enabled(s)) > - return 1; > + if (!s->clock_enabled) { > + return 1; > + } > + if (!rtl8139_receiver_enabled(s)) { > + return 1; > + } > > if (rtl8139_cp_receiver_enabled(s) && rtl8139_cp_rx_valid(s)) { > /* ??? Flow control not implemented in c+ mode. >
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index ef3211537f..be9a0af629 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -799,10 +799,12 @@ static int rtl8139_can_receive(NetClientState *nc) int avail; /* Receive (drop) packets if card is disabled. */ - if (!s->clock_enabled) - return 1; - if (!rtl8139_receiver_enabled(s)) - return 1; + if (!s->clock_enabled) { + return 1; + } + if (!rtl8139_receiver_enabled(s)) { + return 1; + } if (rtl8139_cp_receiver_enabled(s) && rtl8139_cp_rx_valid(s)) { /* ??? Flow control not implemented in c+ mode.
We will modify this code in the next commit. Clean it up first to avoid checkpatch.pl errors. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/net/rtl8139.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)