1. 06 Jan, 2014 4 commits
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · 3a2e15df
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates
      
      This series contains updates to i40e only.
      
      Anjali provides two cleanups to remove unnecessary code and a fix
      to resolve debugfs dumping only half the NVM.  Then provides a fix
      to ethtool NVM reads where shadow RAM was used instead of actual
      NVM reads.
      
      Jesse provides a couple of fixes, one removes custom i40e functions
      which duplicate existing kernel functionality.  Second fixes constant
      cast issues by replacing __constant_htons with htons.
      
      Mitch provides a couple of fixes for the VF interfaces in i40e.  First
      provides a fix to guard against VF message races with can cause a panic.
      Second fix reinitializes the buffer size each time we clean the ARQ,
      because subsequent messages can be truncated. Lastly adds functionality
      to enable/disable ICR 0 dynamically.
      
      Vasu adds a simple guard against multiple includes of the i40e_txrx.h
      file.
      
      Shannon provides a couple of fixes, first fix swaps a couple of lines
      around in the error handling if the allocation for the VSI array fails.
      Second fixes an issue where we try to free the q_vector that has not
      been setup which can panic the kernel.
      
      David provides a patch to save off the point to memory and the length
      of 2 structs used in the admin queue in order to store all info about
      allocated kernel memory.
      
      Neerav fixes ring allocation where allocation and clearing of rings
      for a VSI should be using the alloc_queue_pairs and not num_queue_pairs.
      Then removes the unused define for multi-queue enabled.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3a2e15df
    • Hannes Frederic Sowa's avatar
      8021q: make vlan_pcpu_stats visible without CONFIG_VLAN_8021Q · 1e85c9b6
      Hannes Frederic Sowa authored
      macvlan needs vlan_pcpu_stats so make it visible even if compiling
      without VLAN_8021Q support. Otherwise a very long compiler error happens.
      
      Fixes: cdf3e274 ("macvlan: unify macvlan_pcpu_stats and vlan_pcpu_stats")
      Cc: Li RongQing <roy.qing.li@gmail.com>
      Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
      Acked-By: default avatarLi RongQing <roy.qing.li@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1e85c9b6
    • Daniel Borkmann's avatar
      net: netdev_kobject_init: annotate with __init · a48d4bb0
      Daniel Borkmann authored
      netdev_kobject_init() is only being called from __init context,
      that is, net_dev_init(), so annotate it with __init as well, thus
      the kernel can take this as a hint that the function is used only
      during the initialization phase and free up used memory resources
      after its invocation.
      Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a48d4bb0
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 855404ef
      David S. Miller authored
      Pablo Neira Ayuso says:
      
      ====================
      netfilter/IPVS updates for net-next
      
      The following patchset contains Netfilter updates for your net-next tree,
      they are:
      
      * Add full port randomization support. Some crazy researchers found a way
        to reconstruct the secure ephemeral ports that are allocated in random mode
        by sending off-path bursts of UDP packets to overrun the socket buffer of
        the DNS resolver to trigger retransmissions, then if the timing for the
        DNS resolution done by a client is larger than usual, then they conclude
        that the port that received the burst of UDP packets is the one that was
        opened. It seems a bit aggressive method to me but it seems to work for
        them. As a result, Daniel Borkmann and Hannes Frederic Sowa came up with a
        new NAT mode to fully randomize ports using prandom.
      
      * Add a new classifier to x_tables based on the socket net_cls set via
        cgroups. These includes two patches to prepare the field as requested by
        Zefan Li. Also from Daniel Borkmann.
      
      * Use prandom instead of get_random_bytes in several locations of the
        netfilter code, from Florian Westphal.
      
      * Allow to use the CTA_MARK_MASK in ctnetlink when mangling the conntrack
        mark, also from Florian Westphal.
      
      * Fix compilation warning due to unused variable in IPVS, from Geert
        Uytterhoeven.
      
      * Add support for UID/GID via nfnetlink_queue, from Valentina Giusti.
      
      * Add IPComp extension to x_tables, from Fan Du.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      855404ef
  2. 05 Jan, 2014 36 commits