lkml.org 
[lkml]   [2020]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.5 291/367] ppp: Adjust indentation into ppp_async_input
    Date
    From: Nathan Chancellor <natechancellor@gmail.com>

    commit 08cbc75f96029d3092664213a844a5e25523aa35 upstream.

    Clang warns:

    ../drivers/net/ppp/ppp_async.c:877:6: warning: misleading indentation;
    statement is not part of the previous 'if' [-Wmisleading-indentation]
    ap->rpkt = skb;
    ^
    ../drivers/net/ppp/ppp_async.c:875:5: note: previous statement is here
    if (!skb)
    ^
    1 warning generated.

    This warning occurs because there is a space before the tab on this
    line. Clean up this entire block's indentation so that it is consistent
    with the Linux kernel coding style and clang no longer warns.

    Fixes: 6722e78c9005 ("[PPP]: handle misaligned accesses")
    Link: https://github.com/ClangBuiltLinux/linux/issues/800
    Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/ppp/ppp_async.c | 18 +++++++++---------
    1 file changed, 9 insertions(+), 9 deletions(-)

    --- a/drivers/net/ppp/ppp_async.c
    +++ b/drivers/net/ppp/ppp_async.c
    @@ -874,15 +874,15 @@ ppp_async_input(struct asyncppp *ap, con
    skb = dev_alloc_skb(ap->mru + PPP_HDRLEN + 2);
    if (!skb)
    goto nomem;
    - ap->rpkt = skb;
    - }
    - if (skb->len == 0) {
    - /* Try to get the payload 4-byte aligned.
    - * This should match the
    - * PPP_ALLSTATIONS/PPP_UI/compressed tests in
    - * process_input_packet, but we do not have
    - * enough chars here to test buf[1] and buf[2].
    - */
    + ap->rpkt = skb;
    + }
    + if (skb->len == 0) {
    + /* Try to get the payload 4-byte aligned.
    + * This should match the
    + * PPP_ALLSTATIONS/PPP_UI/compressed tests in
    + * process_input_packet, but we do not have
    + * enough chars here to test buf[1] and buf[2].
    + */
    if (buf[0] != PPP_ALLSTATIONS)
    skb_reserve(skb, 2 + (buf[0] & 1));
    }

    \
     
     \ /
      Last update: 2020-02-10 13:56    [W:6.985 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site