1. 07 1月, 2014 3 次提交
    • D
      netfilter: Fix build failure in nfnetlink_queue_core.c. · 83111e7f
      David S. Miller 提交于
      net/netfilter/nfnetlink_queue_core.c: In function 'nfqnl_put_sk_uidgid':
      net/netfilter/nfnetlink_queue_core.c:304:35: error: 'TCP_TIME_WAIT' undeclared (first use in this function)
      net/netfilter/nfnetlink_queue_core.c:304:35: note: each undeclared identifier is reported only once for each function it appears in
      make[3]: *** [net/netfilter/nfnetlink_queue_core.o] Error 1
      
      Just a missing include of net/tcp_states.h
      Reported-by: NEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      83111e7f
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftables · 9aa28f2b
      David S. Miller 提交于
      Pablo Neira Ayuso says: <pablo@netfilter.org>
      
      ====================
      nftables updates for net-next
      
      The following patchset contains nftables updates for your net-next tree,
      they are:
      
      * Add set operation to the meta expression by means of the select_ops()
        infrastructure, this allows us to set the packet mark among other things.
        From Arturo Borrero Gonzalez.
      
      * Fix wrong format in sscanf in nf_tables_set_alloc_name(), from Daniel
        Borkmann.
      
      * Add new queue expression to nf_tables. These comes with two previous patches
        to prepare this new feature, one to add mask in nf_tables_core to
        evaluate the queue verdict appropriately and another to refactor common
        code with xt_NFQUEUE, from Eric Leblond.
      
      * Do not hide nftables from Kconfig if nfnetlink is not enabled, also from
        Eric Leblond.
      
      * Add the reject expression to nf_tables, this adds the missing TCP RST
        support. It comes with an initial patch to refactor common code with
        xt_NFQUEUE, again from Eric Leblond.
      
      * Remove an unused variable assignment in nf_tables_dump_set(), from Michal
        Nazarewicz.
      
      * Remove the nft_meta_target code, now that Arturo added the set operation
        to the meta expression, from me.
      
      * Add help information for nf_tables to Kconfig, also from me.
      
      * Allow to dump all sets by specifying NFPROTO_UNSPEC, similar feature is
        available to other nf_tables objects, requested by Arturo, from me.
      
      * Expose the table usage counter, so we can know how many chains are using
        this table without dumping the list of chains, from Tomasz Bursztyka.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9aa28f2b
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · 6a8c4796
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates
      
      This series contains updates to i40e only.
      
      Majority of this series contains patches from Greg and Mitch to fix
      up or add functionality to the PF/VF driver interactions.  Notably,
      a fix for SR-IOV VF port VLAN which resolved the problem of port VLAN
      configurations not being persistent across VF driver loads and unloads
      and enable/disable of the feature.  Also do not enable the default port
      on the VEB, which is designed only to bridge the PF to an Open vSwitch
      or bridge.  Another fix to resolve a possible memory corruption
      condition where ARQ messages are written to random memory locations.
      Fix a problem where the 'ip link show' command would display stale
      link address information after the link address was set via the 'ip
      link set' command.
      
      Anjali provides several patches, one which saves information that can
      be used while cleaning the Tx ring and useful in detecting Tx hangs.
      Then provides a fixes to the admin queue shutdown function to ensure
      we are shutting down the queue in the shutdown path and ensure ASQ is
      alive before issuing the admin queue command.
      
      Shannon provides a fix for get/update vsi params where the incorrect
      struct was being used.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6a8c4796
  2. 06 1月, 2014 20 次提交
  3. 05 1月, 2014 17 次提交