summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net/sched: cls_flower: merge filter delete/destroy common codeRoi Dayan2016-11-021-10/+11
* net/sched: cls_flower: add missing unbind call when destroying flowsRoi Dayan2016-11-021-0/+1
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2016-11-0231-340/+1610
|\
| * netfilter: nf_queue: place volatile data in own cachelineFlorian Westphal2016-11-011-1/+1
| * netfilter: nf_tables: remove useless U8_MAX validationLiping Zhang2016-11-012-6/+0
| * netfilter: nf_tables: introduce routing expressionAnders K. Pedersen2016-11-014-0/+187
| * netfilter: move socket lookup infrastructure to nf_socket_ipv{4,6}.cPablo Neira Ayuso2016-11-019-296/+369
| * netfilter: nf_log: add packet logging for netdev familyPablo Neira Ayuso2016-11-017-15/+121
| * netfilter: nf_tables: add fib expressionFlorian Westphal2016-11-0112-0/+854
| * netfilter: nft_ct: add notrack supportPablo Neira Ayuso2016-10-261-1/+49
| * netfilter: nft_meta: permit pkttype mangling in ip/ip6 preroutingLiping Zhang2016-10-261-0/+5
| * netfilter: nft_numgen: start round robin from zeroLiping Zhang2016-10-261-1/+1
| * netfilter: nf_tables: allow expressions to return STOLENFlorian Westphal2016-10-261-0/+1
| * netfilter: nfnetlink_log: Use GFP_NOWARN for skb allocationCalvin Owens2016-10-261-1/+1
| * netfilter: xt_multiport: Use switch case instead of multiple condition checksGao Feng2016-10-261-19/+21
* | genetlink: fix error return code in genl_register_family()Wei Yongjun2016-11-011-1/+3
* | net: Enable support for VRF with ipv4 multicastDavid Ahern2016-11-013-21/+56
* | Merge branch 'tipc-socket-layer-improvements'David S. Miller2016-11-012-238/+242
|\ \
| * | tipc: remove SS_CONNECTED sock stateParthasarathy Bhuvaragan2016-11-011-48/+38
| * | tipc: create TIPC_CONNECTING as a new sk_stateParthasarathy Bhuvaragan2016-11-011-32/+28
| * | tipc: remove SS_DISCONNECTING stateParthasarathy Bhuvaragan2016-11-011-80/+52
| * | tipc: create TIPC_DISCONNECTING as a new sk_stateParthasarathy Bhuvaragan2016-11-011-15/+24
| * | tipc: create TIPC_OPEN as a new sk_stateParthasarathy Bhuvaragan2016-11-011-54/+43
| * | tipc: create TIPC_ESTABLISHED as a new sk_stateParthasarathy Bhuvaragan2016-11-011-7/+11
| * | tipc: create TIPC_LISTEN as a new sk_stateParthasarathy Bhuvaragan2016-11-011-19/+43
| * | tipc: remove socket state SS_READYParthasarathy Bhuvaragan2016-11-011-18/+31
| * | tipc: remove probing_intv from tipc_sockParthasarathy Bhuvaragan2016-11-011-10/+9
| * | tipc: remove tsk->connected from tipc_sockParthasarathy Bhuvaragan2016-11-011-17/+19
| * | tipc: remove tsk->connected for connectionless socketsParthasarathy Bhuvaragan2016-11-011-3/+1
| * | tipc: rename tsk->remote to tsk->peer for consistent namingParthasarathy Bhuvaragan2016-11-011-6/+5
| * | tipc: rename struct tipc_skb_cb member handle to bytes_readParthasarathy Bhuvaragan2016-11-012-9/+11
| * | tipc: set kern=0 in sk_alloc() during tipc_accept()Parthasarathy Bhuvaragan2016-11-011-1/+1
| * | tipc: wakeup sleeping users at disconnectParthasarathy Bhuvaragan2016-11-011-0/+1
| * | tipc: return early for non-blocking sockets at link congestionParthasarathy Bhuvaragan2016-11-011-0/+6
|/ /
* | Merge branch 'nfp-cleanups-and-RX-path-rewrite'David S. Miller2016-11-015-318/+263
|\ \
| * | nfp: bring back support for different ring countsJakub Kicinski2016-11-011-47/+71
| * | nfp: replace num_irqs with max_r_vecsJakub Kicinski2016-11-012-8/+10
| * | nfp: remove nfp_net_irqs_wanted()Jakub Kicinski2016-11-011-23/+4
| * | nfp: use unsigned int for vector/ring countsJakub Kicinski2016-11-012-10/+12
| * | nfp: create separate define for max number of vectorsJakub Kicinski2016-11-011-3/+5
| * | nfp: use AND instead of modulo to get ring indexesJakub Kicinski2016-11-011-7/+7
| * | nfp: add separate buffer allocation function for napiJakub Kicinski2016-11-011-2/+21
| * | nfp: use alloc_frag() and build_skb()Jakub Kicinski2016-11-013-50/+82
| * | nfp: add buffer drop/recycle helper for RXJakub Kicinski2016-11-011-10/+17
| * | nfp: centralize the buffer size calculationJakub Kicinski2016-11-012-9/+21
| * | nfp: remove inline attributes and dead codeJakub Kicinski2016-11-011-14/+1
| * | nfp: remove unnecessary call to ether_setup()Jakub Kicinski2016-11-011-1/+0
| * | nfp: remove support for nfp3200Jakub Kicinski2016-11-014-138/+22
| * | nfp: simplify nfp_net_poll()Jakub Kicinski2016-11-011-9/+3
|/ /
* | Merge branch 'qed-next'David S. Miller2016-11-014-1/+23
|\ \