summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bonding: export slave's actor_oper_port_state via sysfs and netlinkNikolay Aleksandrov2015-06-163-1/+26
* Merge branch 'rocker-no-wait'David S. Miller2015-06-161-127/+118
|\
| * rocker: move port stop to 'no wait' processingScott Feldman2015-06-161-1/+2
| * rocker: move MAC learn event back to 'no wait' processingScott Feldman2015-06-161-37/+3
| * rocker: mark STP update as 'no wait' processingScott Feldman2015-06-161-1/+2
| * rocker: mark neigh update event processing as 'no wait'Scott Feldman2015-06-161-1/+2
| * rocker: revert back to support for nowait processesScott Feldman2015-06-161-90/+112
|/
* rocker: fix neigh tbl index increment raceScott Feldman2015-06-161-2/+2
* rocker: gaurd against NULL rocker_port when removing portsScott Feldman2015-06-161-0/+2
* net: make u64_stats_init() a functionEric Dumazet2015-06-161-3/+4
* bridge: use either ndo VLAN ops or switchdev VLAN ops to install MASTER vlansScott Feldman2015-06-161-2/+57
* Merge branch 'bpf-share-helpers'David S. Miller2015-06-169-22/+199
|\
| * bpf: let kprobe programs use bpf_get_smp_processor_id() helperAlexei Starovoitov2015-06-161-0/+2
| * bpf: allow networking programs to use bpf_trace_printk() for debuggingAlexei Starovoitov2015-06-164-8/+19
| * bpf: introduce current->pid, tgid, uid, gid, comm accessorsAlexei Starovoitov2015-06-169-14/+178
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2015-06-1545-1718/+1972
|\
| * netfilter: nf_tables_netdev: unregister hooks on net_device removalPablo Neira Ayuso2015-06-153-4/+94
| * netfilter: nf_tables: add nft_register_basechain() and nft_unregister_basecha...Pablo Neira Ayuso2015-06-151-15/+37
| * netfilter: nf_tables: attach net_device to basechainPablo Neira Ayuso2015-06-153-41/+46
| * netfilter: x_tables: remove XT_TABLE_INFO_SZ and a dereference.Eric Dumazet2015-06-155-30/+19
| * Merge branch 'master' of git://blackhole.kfki.hu/nf-nextPablo Neira Ayuso2015-06-1525-1312/+1319
| |\
| | * netfilter: ipset: Fix coding styles reported by checkpatch.plJozsef Kadlecsik2015-06-1423-295/+327
| | * netfilter: ipset: Introduce RCU locking in list typeJozsef Kadlecsik2015-06-141-209/+189
| | * netfilter: ipset: Introduce RCU locking in hash:* typesJozsef Kadlecsik2015-06-1412-236/+364
| | * netfilter: ipset: Introduce RCU locking in bitmap:* typesJozsef Kadlecsik2015-06-144-14/+38
| | * netfilter: ipset: Prepare the ipset core to use RCU at set levelJozsef Kadlecsik2015-06-144-50/+66
| | * netfilter:ipset Remove rbtree from hash:net,ifaceJozsef Kadlecsik2015-06-141-143/+20
| | * netfilter: ipset: Make sure listing doesn't grab a set which is just being de...Jozsef Kadlecsik2015-06-141-15/+34
| | * netfilter: ipset: Fix parallel resizing and listing of the same setJozsef Kadlecsik2015-06-143-20/+66
| | * netfilter: ipset: Fix cidr handling for hash:*net* typesJozsef Kadlecsik2015-06-148-36/+42
| | * netfilter: ipset: Check CIDR value only when attribute is givenSergey Popovich2015-06-144-49/+41
| | * netfilter: ipset: Make sure we always return line number on batchSergey Popovich2015-06-1415-75/+75
| | * netfilter: ipset: Permit CIDR equal to the host address CIDR in IPv6Sergey Popovich2015-06-145-15/+43
| | * netfilter: ipset: Check extensions attributes before getting extensions.Sergey Popovich2015-06-1416-170/+29
| | * netfilter: ipset: Use SET_WITH_*() helpers to test set extensionsSergey Popovich2015-06-142-7/+7
| | * netfilter: ipset: Use MSEC_PER_SEC consistentlyJozsef Kadlecsik2015-06-141-2/+2
| * | netfilter: Kconfig: get rid of parens around depends onPablo Neira Ayuso2015-06-153-11/+13
| |/
| * netfilter: xtables: avoid percpu ruleset duplicationFlorian Westphal2015-06-125-149/+57
| * netfilter: xtables: use percpu rule countersFlorian Westphal2015-06-124-14/+129
| * netfilter: bridge: restore vlan tag when refragmentingFlorian Westphal2015-06-121-0/+10
| * net: ip_fragment: remove BRIDGE_NETFILTER mtu special handlingFlorian Westphal2015-06-123-11/+7
| * netfilter: bridge: forward IPv6 fragmented packetsBernhard Thaler2015-06-124-42/+108
| * netfilter: bridge: re-order check_hbh_len()Bernhard Thaler2015-06-121-55/+56
| * netfilter: bridge: rename br_parse_ip_optionsBernhard Thaler2015-06-121-5/+4
| * netfilter: bridge: refactor frag_max_sizeBernhard Thaler2015-06-123-14/+8
| * netfilter: bridge: detect NAT66 correctly and change MAC addressBernhard Thaler2015-06-124-10/+53
| * netfilter: bridge: re-order br_nf_pre_routing_finish_ipv6()Bernhard Thaler2015-06-121-31/+32
| * netfilter: bridge: refactor clearing BRNF_NF_BRIDGE_PREROUTINGBernhard Thaler2015-06-121-2/+2
| * netfilter: conntrack: warn the user if there is a better helper to useMarcelo Ricardo Leitner2015-06-121-1/+7
* | tcp: cdg: use div_u64()Kenneth Klette Jonassen2015-06-141-1/+1