Merge branch 'hsr-next'

Browse source

Murali Karicheri says:

====================
net: hsr: updates from internal tree

This series picks commit from our internal kernel tree.
Patch 1/3 fixes a file name issue introduced in my previous
series.

History:
  v2: fixed patch 3/3 by moving stats update to inside hsr_forward_skb()
====================

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

...

This commit is contained in:

David S. Miller 2019-04-15 17:22:02 -07:00

parent dcdecdcfe1 ee2c46f353

commit 432bc23070

6 changed files with 134 additions and 127 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

net/hsr/Makefile

View file

43

net/hsr/hsr_prp_debugfs.c → net/hsr/hsr_debugfs.c

View file

4

net/hsr/hsr_device.c

View file

7

net/hsr/hsr_forward.c

View file

9

net/hsr/hsr_main.h

View file