Merge branch 'cls_flower'
Jiri Pirko says:
====================
introduce programable flow dissector and cls_flower
Per Davem's request, I prepared this patchset which introduces programmable
flow dissector. For current users of flow_keys, there is a wrapper
skb_flow_dissect_flow_keys which maintains the previous behaviour.
For purposes of cls_flower, couple of new dissection keys were introduced.
Note that this dissector can be also eventually used by openvswitch code.
Also, as a next step, I plan to get rid of *skb_flow_get_ports(export)
and *__skb_get_poff as their functionality can be now implemented by
skb_flow_dissect as well.
v2->v3:
- remove TCA_FLOWER_POLICE attr suggested by Jamal
v1->v2:
- move __skb_tx_hash rather to dev.c as suggested by Alex
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
No related branches found
No related tags found
Showing
- drivers/net/bonding/bond_main.c 10 additions, 10 deletionsdrivers/net/bonding/bond_main.c
- drivers/net/ethernet/cisco/enic/enic_clsf.c 15 additions, 14 deletionsdrivers/net/ethernet/cisco/enic/enic_clsf.c
- drivers/net/ethernet/cisco/enic/enic_ethtool.c 5 additions, 5 deletionsdrivers/net/ethernet/cisco/enic/enic_ethtool.c
- drivers/net/hyperv/netvsc_drv.c 4 additions, 4 deletionsdrivers/net/hyperv/netvsc_drv.c
- include/linux/netdevice.h 3 additions, 0 deletionsinclude/linux/netdevice.h
- include/linux/skbuff.h 3 additions, 11 deletionsinclude/linux/skbuff.h
- include/net/flow_dissector.h 167 additions, 0 deletionsinclude/net/flow_dissector.h
- include/net/flow_keys.h 0 additions, 61 deletionsinclude/net/flow_keys.h
- include/net/ip.h 5 additions, 5 deletionsinclude/net/ip.h
- include/net/ipv6.h 5 additions, 5 deletionsinclude/net/ipv6.h
- include/uapi/linux/pkt_cls.h 30 additions, 0 deletionsinclude/uapi/linux/pkt_cls.h
- net/core/dev.c 106 additions, 0 deletionsnet/core/dev.c
- net/core/filter.c 1 addition, 0 deletionsnet/core/filter.c
- net/core/flow_dissector.c 214 additions, 166 deletionsnet/core/flow_dissector.c
- net/ethernet/eth.c 4 additions, 3 deletionsnet/ethernet/eth.c
- net/sched/Kconfig 10 additions, 0 deletionsnet/sched/Kconfig
- net/sched/Makefile 1 addition, 0 deletionsnet/sched/Makefile
- net/sched/cls_flow.c 11 additions, 11 deletionsnet/sched/cls_flow.c
- net/sched/cls_flower.c 688 additions, 0 deletionsnet/sched/cls_flower.c
- net/sched/sch_choke.c 3 additions, 3 deletionsnet/sched/sch_choke.c
Loading
Please register or sign in to comment