diff options
| author |  David S. Miller <davem@davemloft.net>
| 2017-04-30 22:30:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net>
| 2017-04-30 22:30:13 -0400 |
| commit | c4879789b1fd9764df4465e80096b31d9466de0b (patch) | |
| tree | d67b515cb3a68a29cf5132a94f1be454fc6c5264 /drivers/net/geneve.c | |
| parent | bnx2x: Get rid of useless temporary variable (diff) | |
| parent | vxlan: do not output confusing error message (diff) | |
| download | linux-c4879789b1fd9764df4465e80096b31d9466de0b.tar.gz linux-c4879789b1fd9764df4465e80096b31d9466de0b.tar.bz2 linux-c4879789b1fd9764df4465e80096b31d9466de0b.zip | |
Merge branch 'vxlan-disabled-ipv6'
Jiri Benc says:
====================
vxlan: do not error out on disabled IPv6
This patchset fixes a bug with metadata based tunnels when booted with
ipv6.disable=1.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/geneve.c')
0 files changed, 0 insertions, 0 deletions