]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'flow_dissector-next'
authorDavid S. Miller <davem@davemloft.net>
Fri, 12 Jun 2015 21:24:28 +0000 (14:24 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 12 Jun 2015 21:24:28 +0000 (14:24 -0700)
commitd966a3fcd5bda94394c9c6618672804272e89858
tree9d1b8fe5943f1be0e1244e68d963240571131e7a
parent7f042fa27c3f88f515b87fe681c1a7b1324797f7
parent900105039a14b3cc3ad3a8ea8b724bfcc095c4b2
Merge branch 'flow_dissector-next'

Tom Herbert says:

====================
flow_dissector: Fix MPLS parsing and add ext hdr support

Need to shift label. Added parsing of dst, hop-by-hop, and routing
extension headers.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>