summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* sched: move tcf_proto_destroy and tcf_destroy_chain helpers into cls_apiJiri Pirko2017-02-1015-26/+34
* sched: rename tcf_destroy to tcf_destroy_protoJiri Pirko2017-02-103-7/+7
* Merge branch 'mlxsw-identical-routes-handling'David S. Miller2017-02-103-200/+489
|\
| * mlxsw: spectrum_router: Add support for route replaceIdo Schimmel2017-02-101-7/+37
| * mlxsw: spectrum_router: Add support for route appendIdo Schimmel2017-02-101-6/+37
| * mlxsw: spectrum_router: Correctly handle identical routesIdo Schimmel2017-02-101-178/+403
| * ipv4: fib: Add events for FIB replace and appendIdo Schimmel2017-02-102-14/+16
| * ipv4: fib: Send notification before deleting FIB aliasIdo Schimmel2017-02-101-7/+7
| * ipv4: fib: Send deletion notification with actual FIB alias typeIdo Schimmel2017-02-101-2/+2
| * ipv4: fib: Only flush FIB aliases belonging to currently flushed tableIdo Schimmel2017-02-101-1/+2
|/
* Merge branch 'openvswitch-Conntrack-integration-improvements'David S. Miller2017-02-108-113/+420
|\
| * openvswitch: Pack struct sw_flow_key.Jarno Rajahalme2017-02-104-34/+39
| * openvswitch: Add force commit.Jarno Rajahalme2017-02-102-2/+29
| * openvswitch: Add original direction conntrack tuple to sw_flow_key.Jarno Rajahalme2017-02-108-47/+246
| * openvswitch: Inherit master's labels.Jarno Rajahalme2017-02-101-14/+31
| * openvswitch: Refactor labels initialization.Jarno Rajahalme2017-02-101-42/+62
| * openvswitch: Simplify labels length logic.Jarno Rajahalme2017-02-101-11/+9
| * openvswitch: Unionize ovs_key_ct_label with a u32 array.Jarno Rajahalme2017-02-102-9/+14
| * openvswitch: Do not trigger events for unconfirmed connections.Jarno Rajahalme2017-02-101-6/+22
| * openvswitch: Use inverted tuple in ovs_ct_find_existing() if NATted.Jarno Rajahalme2017-02-101-2/+22
| * openvswitch: Fix comments for skb->_nfctJarno Rajahalme2017-02-101-7/+7
|/
* Merge branch 'ena-bug-fixes'David S. Miller2017-02-106-83/+172
|\
| * net/ena: update driver version to 1.1.2Netanel Belgazal2017-02-101-1/+1
| * net/ena: change condition for host attribute configurationNetanel Belgazal2017-02-102-7/+6
| * net/ena: change driver's default timeoutsNetanel Belgazal2017-02-102-5/+5
| * net/ena: reduce the severity of ena printoutsNetanel Belgazal2017-02-102-13/+28
| * net/ena: use READ_ONCE to access completion descriptorsNetanel Belgazal2017-02-102-4/+5
| * net/ena: use napi_complete_done() return valueNetanel Belgazal2017-02-101-15/+29
| * net/ena: fix potential access to freed memory during device resetNetanel Belgazal2017-02-101-13/+43
| * net/ena: refactor ena_get_stats64 to be atomic context safeNetanel Belgazal2017-02-103-15/+42
| * net/ena: fix NULL dereference when removing the driver after device reset failedNetanel Belgazal2017-02-101-1/+5
| * net/ena: fix RSS default hash configurationNetanel Belgazal2017-02-101-1/+1
| * net/ena: fix ethtool RSS flow configurationNetanel Belgazal2017-02-101-6/+6
| * net/ena: fix queues number calculationNetanel Belgazal2017-02-101-1/+1
| * net/ena: remove ntuple filter support from device feature listNetanel Belgazal2017-02-101-1/+0
|/
* Merge branch 'enic-vxlan-offload'David S. Miller2017-02-096-15/+364
|\
| * enic: add vxlan offload on tx pathGovindarajulu Varadarajan2017-02-091-12/+114
| * enic: add udp_tunnel ndo for vxlan offloadGovindarajulu Varadarajan2017-02-092-3/+159
| * enic: add devcmds for vxlan offloadGovindarajulu Varadarajan2017-02-094-0/+91
|/
* net: dsa: mv88e6xxx: Move forward declaration to where it is neededAndrew Lunn2017-02-091-2/+2
* net: dsa: Fix duplicate object ruleFlorian Fainelli2017-02-091-1/+0
* Merge branch 'qcom-emac-more-ethtool'David S. Miller2017-02-093-81/+143
|\
| * net: qcom/emac: add ethtool support for setting ring parametersTimur Tabi2017-02-091-0/+24
| * net: qcom/emac: add ethtool support for reading hardware registersTimur Tabi2017-02-093-81/+119
|/
* ARM: orion: remove unused wnr854t_switch_plat_dataArnd Bergmann2017-02-091-5/+0
* Merge branch 'sctp-sender-stream-reconf-reset-add-streams'David S. Miller2017-02-097-4/+297
|\
| * sctp: implement sender-side procedures for Add Incoming/Outgoing Streams Requ...Xin Long2017-02-094-0/+115
| * sctp: add support for generating stream reconf add incoming/outgoing streams ...Xin Long2017-02-093-0/+56
| * sctp: implement sender-side procedures for SSN/TSN Reset Request ParameterXin Long2017-02-094-0/+71
| * sctp: add support for generating stream reconf ssn/tsn reset request chunkXin Long2017-02-093-0/+36