19 Dec, 2013

13 commits

  • Conflicts:
    drivers/net/ethernet/intel/i40e/i40e_main.c
    drivers/net/macvtap.c

    Both minor merge hassles, simple overlapping changes.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Drivers should call skb_set_hash to set the hash and its type
    in an skbuff.

    Signed-off-by: Tom Herbert
    Signed-off-by: David S. Miller

    Tom Herbert
     
  • Drivers should call skb_set_hash to set the hash and its type
    in an skbuff.

    Signed-off-by: Tom Herbert
    Signed-off-by: David S. Miller

    Tom Herbert
     
  • Drivers should call skb_set_hash to set the hash and its type
    in an skbuff.

    Signed-off-by: Tom Herbert
    Signed-off-by: David S. Miller

    Tom Herbert
     
  • Drivers should call skb_set_hash to set the hash and its type
    in an skbuff.

    Signed-off-by: Tom Herbert
    Signed-off-by: David S. Miller

    Tom Herbert
     
  • Drivers should call skb_set_hash to set the hash and its type
    in an skbuff.

    Signed-off-by: Tom Herbert
    Signed-off-by: David S. Miller

    Tom Herbert
     
  • Drivers should call skb_set_hash to set the hash and its type
    in an skbuff.

    Signed-off-by: Tom Herbert
    Signed-off-by: David S. Miller

    Tom Herbert
     
  • Drivers should call skb_set_hash to set the hash and its type
    in an skbuff.

    Signed-off-by: Tom Herbert
    Signed-off-by: David S. Miller

    Tom Herbert
     
  • Drivers should call skb_set_hash to set the hash and its type
    in an skbuff.

    Signed-off-by: Tom Herbert
    Signed-off-by: David S. Miller

    Tom Herbert
     
  • Drivers should call skb_set_hash to set the hash and its type
    in an skbuff.

    Signed-off-by: Tom Herbert
    Signed-off-by: David S. Miller

    Tom Herbert
     
  • Drivers should call skb_set_hash to set the hash and its type
    in an skbuff.

    Signed-off-by: Tom Herbert
    Signed-off-by: David S. Miller

    Tom Herbert
     
  • Drivers should call skb_set_hash to set the hash and its type
    in an skbuff.

    Signed-off-by: Tom Herbert
    Signed-off-by: David S. Miller

    Tom Herbert
     
  • Jeff Kirsher says:

    ====================
    Intel Wired LAN Driver Updates

    This series contains updates to i40e, ixgbevf, ixgbe and igb.

    Don provides an ixgbevf patch to add DCB configuration into the queue
    setup so that we won't have to allocate queues in a separate place when
    enabling DCB.

    Guenter Roeck provides 2 patches for ixgbe to simplify the code by
    attaching hwmon sysfs attributes to hwmon device instead of PCI device.
    Also fix an issues where the temperature sensor attribute index was
    being started with the value 0 and not 1 as per the hwmon API.

    Carolyn provides igb patches to fix queue allocation method to
    accommodate changes during runtime. This includes changing how the
    driver initializes MSIx and checks for MSIx configuration to make it
    easier to reconfigure the device when queue changes happen at runtime.

    Neerav and Shannon fixes i40e debugfs commands that dump hex information
    by using print_hex_dump().

    Shannon provides several i40e fixes which include the prevention of
    null pointer exception in the dump descriptor by checking that rings
    were allocated before trying to reference them. Fixed up a couple of
    scanfs to accept various base numbers instead of silently requiring hex.

    Anjali fixes up i40e where the incorrect defines were being used for
    misc interrupts.

    Alan Cox provides a fix for i40e where we assume that the resulting
    buffer is zero terminated when we then re-use it. The sscanf is limited
    to 512 bytes but needs to be 511 to allow for a terminator.

    Stephen Hemminger fixes i40e by making local functions static and removes
    unused code (i40e_aq_add/remove_vlan() functions).
    ====================

    Signed-off-by: David S. Miller

    David S. Miller
     

18 Dec, 2013

27 commits