aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2014-09-26netfilter: bridge: nf_bridge_copy_header as static inline in headerPablo Neira Ayuso2-38/+38
2014-09-26net/netfilter/x_tables.c: use __seq_open_private()Rob Jones1-26/+4
2014-09-19netfilter: nf_tables: export rule-set generation IDPablo Neira Ayuso2-26/+130
2014-09-19netfilter: nfnetlink: use original skbuff when committing/abortingPablo Neira Ayuso1-3/+3
2014-09-18Merge branch 'ipvs-next'Pablo Neira Ayuso23-225/+544
2014-09-18ipvs: Allow heterogeneous pools now that we support themAlex Gartrell1-4/+20
2014-09-18ipvs: use the new dest addr family fieldJulian Anastasov4-16/+43
2014-09-18ipvs: use correct address family in scheduler logsJulian Anastasov9-12/+15
2014-09-16ipvs: address family of LBLCR entry depends on svc familyJulian Anastasov1-6/+6
2014-09-16ipvs: address family of LBLC entry depends on svc familyJulian Anastasov1-6/+6
2014-09-16ipvs: support ipv4 in ipv6 and ipv6 in ipv4 tunnel forwardingAlex Gartrell2-43/+117
2014-09-16ipvs: Add generic ensure_mtu_is_adequate to handle mixed poolsAlex Gartrell1-26/+51
2014-09-16ipvs: Pull out update_pmtu codeAlex Gartrell1-12/+11
2014-09-16ipvs: Pull out crosses_local_route_boundary logicAlex Gartrell1-67/+77
2014-09-16ipvs: prevent mixing heterogeneous pools and synchronizationAlex Gartrell2-0/+19
2014-09-16ipvs: Supply destination address family to ip_vs_conn_newAlex Gartrell5-10/+16
2014-09-16ipvs: Pass destination address family to ip_vs_trash_get_destAlex Gartrell1-6/+6
2014-09-16ipvs: Supply destination addr family to ip_vs_{lookup_dest,find_dest}Alex Gartrell4-17/+30
2014-09-16ipvs: Add destination address family to netlink interfaceAlex Gartrell3-7/+44
2014-09-16ipvs: Add simple weighted failover schedulerKenny Mathis3-0/+90
2014-09-15netfilter: ipset: hash:mac type added to ipsetJozsef Kadlecsik4-1/+193
2014-09-15netfilter: ipset: send nonzero skbinfo extensions onlyJozsef Kadlecsik1-7/+11
2014-09-15netfilter: ipset: Add skbinfo extension support to SET target.Anton Danilov2-0/+165
2014-09-15netfilter: ipset: Add skbinfo extension kernel support for the list set type.Anton Danilov1-2/+17
2014-09-15netfilter: ipset: Add skbinfo extension kernel support for the hash set types.Anton Danilov11-25/+130
2014-09-15netfilter: ipset: Add skbinfo extension kernel support for the bitmap set types.Anton Danilov4-6/+31
2014-09-15netfilter: ipset: Add skbinfo extension kernel support in the ipset core.Anton Danilov3-2/+93
2014-09-15netfilter: ipset: Fix static checker warning in ip_set_core.cJozsef Kadlecsik1-1/+2
2014-09-12netfilter: masquerading needs to be independent of x_tables in KconfigPablo Neira Ayuso2-24/+30
2014-09-12netfilter: NFT_CHAIN_NAT_IPV* is independent of NFT_NATPablo Neira Ayuso2-20/+22
2014-09-11netfilter: nf_tables: add NFTA_MASQ_UNSPEC to nft_masq_attributesPablo Neira Ayuso1-0/+1
2014-09-11netfilter: fix compilation of masquerading without IP_NF_TARGET_MASQUERADEPablo Neira Ayuso1-6/+4
2014-09-10net: bpf: only build bpf_jit_binary_{alloc, free}() when jit selectedDaniel Borkmann2-39/+41
2014-09-10Merge branch 'cxgb4-next'David S. Miller4-3/+37
2014-09-10cxgb4/cxgb4vf: Add device ID for new adapter and remove for dbg adapterHariprasad Shenai2-2/+3
2014-09-10cxgb4: Add warning msg when attaching to adapters which have FLASHes smaller than 2MbHariprasad Shenai2-0/+10
2014-09-10cxgb4: Fix t4_flash_erase_sectors() to throw an error when requested to erase sectors which aren't in the FLASHHariprasad Shenai1-0/+3
2014-09-10cxgb4: Add support to S25FL032P flashHariprasad Shenai1-0/+20
2014-09-10cxgb4: Allow T4/T5 firmware sizes up to 1MBHariprasad Shenai1-1/+1
2014-09-10tipc: fix sparse warningsErik Hugne1-3/+4
2014-09-10net: ethernet: arc: Don't free Rockchip resources before disconnect from phyRomain Perier1-1/+2
2014-09-10Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller45-1070/+1759
2014-09-10netfilter: Convert pr_warning to pr_warnJoe Perches5-40/+35
2014-09-10iucv: Convert pr_warning to pr_warnJoe Perches1-5/+4
2014-09-10pktgen: Convert pr_warning to pr_warnJoe Perches1-12/+12
2014-09-10atm: Convert pr_warning to pr_warnJoe Perches2-3/+3
2014-09-09Merge branch 'ipip_sit_gro'David S. Miller2-0/+7
2014-09-09sit: Add gro callbacks to sit_offloadTom Herbert1-0/+2
2014-09-09ipip: Add gro callbacks to ipip offloadTom Herbert1-0/+2
2014-09-09ipv6: Clear flush_id to make GRO workTom Herbert1-0/+3