1. 04 4月, 2015 6 次提交
    • A
      jhash: Update jhash_[321]words functions to use correct initval · 2e7056c4
      Alexander Duyck 提交于
      Looking over the implementation for jhash2 and comparing it to jhash_3words
      I realized that the two hashes were in fact very different.  Doing a bit of
      digging led me to "The new jhash implementation" in which lookup2 was
      supposed to have been replaced with lookup3.
      
      In reviewing the patch I noticed that jhash2 had originally initialized a
      and b to JHASH_GOLDENRATIO and c to initval, but after the patch a, b, and
      c were initialized to initval + (length << 2) + JHASH_INITVAL.  However the
      changes in jhash_3words simply replaced the initialization of a and b with
      JHASH_INITVAL.
      
      This change corrects what I believe was an oversight so that a, b, and c in
      jhash_3words all have the same value added consisting of initval + (length
      << 2) + JHASH_INITVAL so that jhash2 and jhash_3words will now produce the
      same hash result given the same inputs.
      
      Fixes: 60d509c8 ("The new jhash implementation")
      Signed-off-by: NAlexander Duyck <alexander.h.duyck@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2e7056c4
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · 5c5e0ad3
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates 2015-04-03
      
      This series contains updates to i40e and i40evf only.
      
      Anjali provides a fix for verifying outer UDP receive checksum.  Also
      adds helpful information to display when figuring out the cause of
      HMC errors.
      
      Mitch provides a fix to prevent a malicious or buggy VF driver from
      sending an invalid index into the VSI array which could panic the host.
      Cleans up the code where a function was moved, but the message did
      not follow.  Adds protection to the VLAN filter list, same as the
      MAC filter list, to protect from corruption if the watchdog happens
      to run at the same time as a VLAN filter is being added/deleted.
      
      Jesse changes several memcpy() statements to struct assignments which
      are type safe and preferable.  Fixed a bug when skb allocation fails,
      where we should not continue using the skb pointer.  Also fixed a void
      function in FCoE which should not be returning anything.
      
      Greg fixes both i40e and i40evf to set the Ethernet protocol correctly
      when transmit VLAN offloads are disabled.
      
      Shannon fixes up VLAN messages when ports are added or removed, which
      were giving bogus index info.  Also aligned the message text style
      with other messages in the driver.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5c5e0ad3
    • R
      netdevice: document NETDEV_TX_BUSY deprecation. · e79d8429
      Rusty Russell 提交于
      This paraphrases DaveM (and steals some of his words) explaining why
      a device shouldn't return NETDEV_TX_BUSY, even though it looks so inviting
      to driver authors.
      
      See http://www.spinics.net/lists/netdev/msg322350.htmlInspired-by: NDavid Miller <davem@davemloft.net>
      Signed-off-by: NRusty Russell <rusty@rustcorp.com.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e79d8429
    • D
      Merge branch 'ipv4-null-cmp' · 0bd66827
      David S. Miller 提交于
      Ian Morris says:
      
      ====================
      ipv4: coding style - comparisons with NULL
      
      Per the suggestion of Joe Perches, attached is a patch which aligns the
      coding style in ipv4 for comparisons with NULL.
      
      The code uses multiple different styles when comparing with NULL (I.e.
      x == NULL and !x as well as x != NULL and x). Generally the latter form
      is preferred in netdev and so this changes aligns the code to this style.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0bd66827
    • I
      ipv4: coding style: comparison for inequality with NULL · 00db4124
      Ian Morris 提交于
      The ipv4 code uses a mixture of coding styles. In some instances check
      for non-NULL pointer is done as x != NULL and sometimes as x. x is
      preferred according to checkpatch and this patch makes the code
      consistent by adopting the latter form.
      
      No changes detected by objdiff.
      Signed-off-by: NIan Morris <ipm@chirality.org.uk>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      00db4124
    • I
      ipv4: coding style: comparison for equality with NULL · 51456b29
      Ian Morris 提交于
      The ipv4 code uses a mixture of coding styles. In some instances check
      for NULL pointer is done as x == NULL and sometimes as !x. !x is
      preferred according to checkpatch and this patch makes the code
      consistent by adopting the latter form.
      
      No changes detected by objdiff.
      Signed-off-by: NIan Morris <ipm@chirality.org.uk>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      51456b29
  2. 03 4月, 2015 34 次提交