1. 03 3月, 2015 6 次提交
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 77f0379f
      David S. Miller 提交于
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter updates for net-next
      
      A small batch with accumulated updates in nf-next, mostly IPVS updates,
      they are:
      
      1) Add 64-bits stats counters to IPVS, from Julian Anastasov.
      
      2) Move NETFILTER_XT_MATCH_ADDRTYPE out of NETFILTER_ADVANCED as docker
      seem to require this, from Anton Blanchard.
      
      3) Use boolean instead of numeric value in set_match_v*(), from
      coccinelle via Fengguang Wu.
      
      4) Allows rescheduling of new connections in IPVS when port reuse is
      detected, from Marcelo Ricardo Leitner.
      
      5) Add missing bits to support arptables extensions from nft_compat,
      from Arturo Borrero.
      
      Patrick is preparing a large batch to enhance the set infrastructure,
      named expressions among other things, that should follow up soon after
      this batch.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      77f0379f
    • D
      filter: refactor common filter attach code into __sk_attach_prog · 49b31e57
      Daniel Borkmann 提交于
      Both sk_attach_filter() and sk_attach_bpf() are setting up sk_filter,
      charging skmem and attaching it to the socket after we got the eBPF
      prog up and ready. Lets refactor that into a common helper.
      Signed-off-by: NDaniel Borkmann <daniel@iogearbox.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      49b31e57
    • D
      Merge branch 'for-upstream' of... · 70c836a4
      David S. Miller 提交于
      Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
      
      Johan Hedberg says:
      
      ====================
      pull request: bluetooth-next 2015-03-02
      
      Here's the first bluetooth-next pull request targeting the 4.1 kernel:
      
       - ieee802154/6lowpan cleanups
       - SCO routing to host interface support for the btmrvl driver
       - AMP code cleanups
       - Fixes to AMP HCI init sequence
       - Refactoring of the HCI callback mechanism
       - Added shutdown routine for Intel controllers in the btusb driver
       - New config option to enable/disable Bluetooth debugfs information
       - Fix for early data reception on L2CAP fixed channels
      
      Please let me know if there are any issues pulling. Thanks.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      70c836a4
    • D
      Merge branch 'sendmsg_recvmsg_iocb_removal' · b4844353
      David S. Miller 提交于
      Ying Xue says:
      
      ====================
      net: Remove iocb argument from sendmsg and recvmsg
      
      Currently there is only one user - TIPC whose sendmsg() instances
      using iocb argument. Meanwhile, there is no user using iocb argument
      in its recvmsg() instance. Therefore, if we eliminate the werid usage
      of iobc argument from TIPC, the iocb argument can be removed from
      all sendmsg() and recvmsg() instances of the whole networking stack.
      
      Reference:
      https://patchwork.ozlabs.org/patch/433960/
      
      Changes:
      
      v2:
       * Fix compile errors of DCCP module pointed by David
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b4844353
    • Y
      net: Remove iocb argument from sendmsg and recvmsg · 1b784140
      Ying Xue 提交于
      After TIPC doesn't depend on iocb argument in its internal
      implementations of sendmsg() and recvmsg() hooks defined in proto
      structure, no any user is using iocb argument in them at all now.
      Then we can drop the redundant iocb argument completely from kinds of
      implementations of both sendmsg() and recvmsg() in the entire
      networking stack.
      
      Cc: Christoph Hellwig <hch@lst.de>
      Suggested-by: NAl Viro <viro@ZenIV.linux.org.uk>
      Signed-off-by: NYing Xue <ying.xue@windriver.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      1b784140
    • Y
      tipc: Don't use iocb argument in socket layer · 39a0295f
      Ying Xue 提交于
      Currently the iocb argument is used to idenfiy whether or not socket
      lock is hold before tipc_sendmsg()/tipc_send_stream() is called. But
      this usage prevents iocb argument from being dropped through sendmsg()
      at socket common layer. Therefore, in the commit we introduce two new
      functions called __tipc_sendmsg() and __tipc_send_stream(). When they
      are invoked, it assumes that their callers have taken socket lock,
      thereby avoiding the weird usage of iocb argument.
      
      Cc: Al Viro <viro@ZenIV.linux.org.uk>
      Cc: Christoph Hellwig <hch@lst.de>
      Reviewed-by: NErik Hugne <erik.hugne@ericsson.com>
      Reviewed-by: NJon Maloy <jon.maloy@ericsson.com>
      Signed-off-by: NYing Xue <ying.xue@windriver.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      39a0295f
  2. 02 3月, 2015 23 次提交
  3. 01 3月, 2015 11 次提交