OSDN Git Service

Merge branch 'mlxsw-Two-small-updates'
authorJakub Kicinski <jakub.kicinski@netronome.com>
Mon, 25 Nov 2019 02:35:05 +0000 (18:35 -0800)
committerJakub Kicinski <jakub.kicinski@netronome.com>
Mon, 25 Nov 2019 02:36:29 +0000 (18:36 -0800)
commitbd85880197d2f0150b10baf2fdfea7eed13f4aa8
treec5515fbcf4556919a329c21b4813fce0dae43650
parentc392bccf2c1075b5d2cc9022d0116a516acb721d
parented43cff065d7ca2ffa60a7a1ea62be4a574529f9
Merge branch 'mlxsw-Two-small-updates'

Ido Schimmel says:

====================
mlxsw: Two small updates

Patch #1 from Petr handles a corner case in GRE tunnel offload.

Patch #2 from Amit fixes a recent issue where the driver was programming
the device to use an adjacency index (for a nexthop) that was not
properly initialized.
====================

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>