summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* batman-adv: Use common Jenkins Hash implementationSven Eckelmann2015-06-077-62/+25
* bpf: allow programs to write to certain skb fieldsAlexei Starovoitov2015-06-071-12/+82
* bpf: make programs see skb->data == L2 for ingress and egressAlexei Starovoitov2015-06-073-25/+26
* tcp: remove redundant checks IIEric Dumazet2015-06-072-8/+0
* inet: add IP_BIND_ADDRESS_NO_PORT to overcome bind(0) limitationsEric Dumazet2015-06-063-2/+11
* mpls: Add MPLS entropy label in flow_keysTom Herbert2015-06-041-0/+35
* net: Add GRE keyid in flow_keysTom Herbert2015-06-041-1/+23
* net: Add IPv6 flow label to flow_keysTom Herbert2015-06-041-19/+10
* net: Add VLAN ID to flow_keysTom Herbert2015-06-041-0/+14
* net: Get rid of IPv6 hash addresses flow keysTom Herbert2015-06-041-17/+0
* net: Add keys for TIPC addressTom Herbert2015-06-041-5/+13
* net: Add full IPv6 addresses to flow_keysTom Herbert2015-06-044-29/+114
* net: Get skb hash over flow_keys structureTom Herbert2015-06-042-13/+43
* net: Remove superfluous setting of key_basicTom Herbert2015-06-041-6/+0
* net: Simplify GRE case in flow_dissectorTom Herbert2015-06-041-22/+22
* bpf: fix build due to missing tc_verdAlexei Starovoitov2015-06-041-3/+1
* tcp: double default TSQ output bytes limitWei Liu2015-06-041-2/+2
* tcp: remove redundant checksEric Dumazet2015-06-042-4/+4
* switchdev: documentation: use switchdev_port_obj_xxx for IPv4 FIB add/modify/...Scott Feldman2015-06-031-2/+2
* Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2015-06-034-45/+41
|\
| * batman-adv: Remove unnecessary ret variable in algo_registerMarkus Pargmann2015-06-031-5/+2
| * batman-adv: Remove unnecessary ret variableMarkus Pargmann2015-06-031-8/+3
| * batman-adv: main, batadv_compare_eth return boolMarkus Pargmann2015-06-031-1/+1
| * batman-adv: main, Convert is_my_mac() to boolMarkus Pargmann2015-06-032-5/+8
| * batman-adv: Remove unnecessary check for orig_ifinfo not NULLSven Eckelmann2015-06-031-2/+1
| * batman-adv: types, Fix comment on bcast_ownMarkus Pargmann2015-06-031-3/+4
| * batman-adv: iv_ogm, fix comment function nameMarkus Pargmann2015-06-031-1/+1
| * batman-adv: iv_ogm, fix coding styleMarkus Pargmann2015-06-031-1/+3
| * batman-adv: iv_ogm, Fix dup_status commentMarkus Pargmann2015-06-031-1/+1
| * batman-adv: iv_ogm_orig_update, style, add missing bracketsMarkus Pargmann2015-06-031-1/+2
| * batman-adv: iv_ogm_queue_add, Simplify expressionsMarkus Pargmann2015-06-031-2/+2
| * batman-adv: iv_ogm_aggregate_new, simplify error handlingMarkus Pargmann2015-06-031-15/+13
* | bpf: introduce bpf_clone_redirect() helperAlexei Starovoitov2015-06-031-0/+40
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-06-0126-119/+215
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2015-06-011-4/+0
| |\
| | * Revert "netfilter: ensure number of counters is >0 in do_replace()"Bernhard Thaler2015-06-011-4/+0
| * | vti6: Add pmtu handling to vti6_xmit.Steffen Klassert2015-06-011-0/+14
| * | Revert "net: core: 'ethtool' issue with querying phy settings"David S. Miller2015-06-011-9/+1
| * | net: dsa: Properly propagate errors from dsa_switch_setup_oneFlorian Fainelli2015-05-311-2/+2
| * | tcp: fix child sockets to use system default congestion control if not setNeal Cardwell2015-05-312-2/+8
| * | udp: fix behavior of wrong checksumsEric Dumazet2015-05-312-8/+4
| * | bridge: fix br_multicast_query_expired() bugEric Dumazet2015-05-301-1/+1
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2015-05-287-11/+43
| |\ \
| | * | ip_vti/ip6_vti: Preserve skb->mark after rcv_cb callAlexander Duyck2015-05-282-4/+14
| | * | xfrm: Override skb->mark with tunnel->parm.i_key in xfrm_inputAlexander Duyck2015-05-281-1/+16
| | * | ip_vti/ip6_vti: Do not touch skb->mark on xmitAlexander Duyck2015-05-282-3/+6
| | * | xfrm: Always zero high-order sequence number bitsHerbert Xu2015-05-211-0/+2
| | * | esp6: Use high-order sequence number bits for IV generationHerbert Xu2015-05-131-1/+2
| | * | esp4: Use high-order sequence number bits for IV generationHerbert Xu2015-05-131-1/+2
| | * | xfrm: fix a race in xfrm_state_lookup_byspiLi RongQing2015-04-291-1/+1