1. 02 Oct, 2020 2 commits
    • Ye Bin's avatar
      pktgen: Fix inconsistent of format with argument type in pktgen.c · 32be425b
      Ye Bin authored
      Fix follow warnings:
      [net/core/pktgen.c:925]: (warning) %u in format string (no. 1)
      	requires 'unsigned int' but the argument type is 'signed int'.
      [net/core/pktgen.c:942]: (warning) %u in format string (no. 1)
      	requires 'unsigned int' but the argument type is 'signed int'.
      [net/core/pktgen.c:962]: (warning) %u in format string (no. 1)
      	requires 'unsigned int' but the argument type is 'signed int'.
      [net/core/pktgen.c:984]: (warning) %u in format string (no. 1)
      	requires 'unsigned int' but the argument type is 'signed int'.
      [net/core/pktgen.c:1149]: (warning) %d in format string (no. 1)
      	requires 'int' but the argument type is 'unsigned int'.
      Reported-by: default avatarHulk Robot <hulkci@huawei.com>
      Signed-off-by: default avatarYe Bin <yebin10@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      32be425b
    • Xie He's avatar
      drivers/net/wan/hdlc_fr: Correctly handle special skb->protocol values · 8306266c
      Xie He authored
      The fr_hard_header function is used to prepend the header to skbs before
      transmission. It is used in 3 situations:
      1) When a control packet is generated internally in this driver;
      2) When a user sends an skb on an Ethernet-emulating PVC device;
      3) When a user sends an skb on a normal PVC device.
      
      These 3 situations need to be handled differently by fr_hard_header.
      Different headers should be prepended to the skb in different situations.
      
      Currently fr_hard_header distinguishes these 3 situations using
      skb->protocol. For situation 1 and 2, a special skb->protocol value
      will be assigned before calling fr_hard_header, so that it can recognize
      these 2 situations. All skb->protocol values other than these special ones
      are treated by fr_hard_header as situation 3.
      
      However, it is possible that in situation 3, the user sends an skb with
      one of the special skb->protocol values. In this case, fr_hard_header
      would incorrectly treat it as situation 1 or 2.
      
      This patch tries to solve this issue by using skb->dev instead of
      skb->protocol to distinguish between these 3 situations. For situation
      1, skb->dev would be NULL; for situation 2, skb->dev->type would be
      ARPHRD_ETHER; and for situation 3, skb->dev->type would be ARPHRD_DLCI.
      
      This way fr_hard_header would be able to distinguish these 3 situations
      correctly regardless what skb->protocol value the user tries to use in
      situation 3.
      
      Cc: Krzysztof Halasa <khc@pm.waw.pl>
      Signed-off-by: default avatarXie He <xie.he.0141@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8306266c
  2. 01 Oct, 2020 35 commits
  3. 30 Sep, 2020 3 commits
    • David S. Miller's avatar
      Merge tag 'linux-can-next-for-5.10-20200930' of... · 8333c1c4
      David S. Miller authored
      Merge tag 'linux-can-next-for-5.10-20200930' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
      
      Marc Kleine-Budde says:
      
      ====================
      pull-request: can-next 2020-09-30
      
      this is a pull request of 13 patches for net-next.
      
      The first 10 target the mcp25xxfd driver (which is renamed to mcp251xfd during
      this series).
      
      The first two patches are by Thomas Kopp, which adds reference to the just
      related errata and updates the documentation and log messages.
      
      Dan Carpenter's patch fixes a resource leak during ifdown.
      
      A patch by me adds the missing initialization of a variable.
      
      Oleksij Rempel updates the DT binding documentation as requested by Rob
      Herring.
      
      The next 5 patches are by Thomas Kopp and me. During review Geert Uytterhoeven
      suggested to use "microchip,mcp251xfd" instead of "microchip,mcp25xxfd" as the
      DT autodetection compatible to avoid clashes with future but incompatible
      devices. We decided not only to rename the compatible but the whole driver from
      "mcp25xxfd" to "mcp251xfd". This is done in several patches.
      
      Joakim Zhang contributes three patches for the flexcan driver. The first one
      adds support for the ECC feature, which is implemented on some modern IP cores,
      by initializing the controller's memory during ifup. The next patch adds
      support for the i.MX8MP (which supports ECC) and the last patch properly
      disables the runtime PM if device registration fails.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8333c1c4
    • David S. Miller's avatar
      Merge branch 'ionic-watchdog-training' · 11789fe7
      David S. Miller authored
      Shannon Nelson says:
      
      ====================
      ionic watchdog training
      
      Our link watchdog displayed a couple of unfriendly behaviors in some recent
      stress testing.  These patches change the startup and stop timing in order
      to be sure that expected structures are ready to be used by the watchdog.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      11789fe7
    • Shannon Nelson's avatar
      ionic: prevent early watchdog check · 0816e0c8
      Shannon Nelson authored
      In one corner case scenario, the driver device lif setup can
      get delayed such that the ionic_watchdog_cb() timer goes off
      before the ionic->lif is set, thus causing a NULL pointer panic.
      We catch the problem by checking for a NULL lif just a little
      earlier in the callback.
      Signed-off-by: default avatarShannon Nelson <snelson@pensando.io>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0816e0c8