Skip to content
  1. Aug 31, 2019
  2. Aug 30, 2019
    • Gustavo A. R. Silva's avatar
      net: spider_net: Use struct_size() helper · 3f1071ec
      Gustavo A. R. Silva authored
      
      
      One of the more common cases of allocation size calculations is finding
      the size of a structure that has a zero-sized array at the end, along
      with memory for some number of elements for that array. For example:
      
      struct spider_net_card {
      	...
              struct spider_net_descr darray[0];
      };
      
      Make use of the struct_size() helper instead of an open-coded version
      in order to avoid any potential type mistakes.
      
      So, replace the following form:
      
      sizeof(struct spider_net_card) + (tx_descriptors + rx_descriptors) * sizeof(struct spider_net_descr)
      
      with:
      
      struct_size(card, darray, tx_descriptors + rx_descriptors)
      
      Notice that, in this case, variable alloc_size is not necessary, hence it
      is removed.
      
      Building: allmodconfig powerpc.
      
      This code was detected with the help of Coccinelle.
      
      Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3f1071ec
    • David S. Miller's avatar
      Merge branch 'r8169-add-support-for-RTL8125' · b4e11253
      David S. Miller authored
      
      
      Heiner Kallweit says:
      
      ====================
      r8169: add support for RTL8125
      
      This series adds support for the 2.5Gbps chip RTl8125. It can be found
      on PCIe network cards, and on an increasing number of consumer gaming
      mainboards. Series is partially based on the r8125 vendor driver.
      Tested with a Delock 89531 PCIe card against a Netgear GS110MX
      Multi-Gig switch.
      Firmware isn't strictly needed, but on some systems there may be
      compatibility issues w/o firmware. Firmware has been submitted to
      linux-firmware.
      
      v2:
      - split first patch into 6 smaller ones to facilitate bisecting
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b4e11253