diff options
author | Laura Abbott <labbott@fedoraproject.org> | 2017-04-11 09:17:23 -0700 |
---|---|---|
committer | Laura Abbott <labbott@fedoraproject.org> | 2017-04-11 09:18:06 -0700 |
commit | 78568f86d42e207004b1af06a44b6f986c6ce300 (patch) | |
tree | 5924d8ff4f760b9e6742fb3c49e63a709a001c92 | |
parent | a39d8a39a434c35c13e05733a0d81b6356640acf (diff) | |
download | kernel-78568f86d42e207004b1af06a44b6f986c6ce300.tar.gz kernel-78568f86d42e207004b1af06a44b6f986c6ce300.tar.xz kernel-78568f86d42e207004b1af06a44b6f986c6ce300.zip |
Fix for openshift networking (rhbz 1441310)
-rw-r--r-- | kernel.spec | 6 | ||||
-rw-r--r-- | rhbz_1441310.patch | 37 |
2 files changed, 43 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index 37662c98f..e67894dc0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -619,6 +619,9 @@ Patch861: 0001-efi-libstub-Treat-missing-SecureBoot-variable-as-Sec.patch #rhbz 1439613 Patch862: 1-2-media-cxusb-Use-a-dma-capable-buffer-also-for-reading.patch +#rhbz 1441310 +Patch863: rhbz_1441310.patch + # END OF PATCH DEFINITIONS %endif @@ -2188,6 +2191,9 @@ fi # # %changelog +* Tue Apr 11 2017 Laura Abbott <labbott@fedoraproject.org> +- Fix for openshift networking (rhbz 1441310) + * Mon Apr 10 2017 Laura Abbott <labbott@fedoraproject.org> - Re-add fix for cxusb DMA on stack (rhbz 1439613) diff --git a/rhbz_1441310.patch b/rhbz_1441310.patch new file mode 100644 index 000000000..63a404ec6 --- /dev/null +++ b/rhbz_1441310.patch @@ -0,0 +1,37 @@ +From 425df17ce3a26d98f76e2b6b0af2acf4aeb0b026 Mon Sep 17 00:00:00 2001 +From: Jarno Rajahalme <jarno@ovn.org> +Date: Tue, 14 Feb 2017 21:16:28 -0800 +Subject: openvswitch: Set internal device max mtu to ETH_MAX_MTU. + +Commit 91572088e3fd ("net: use core MTU range checking in core net +infra") changed the openvswitch internal device to use the core net +infra for controlling the MTU range, but failed to actually set the +max_mtu as described in the commit message, which now defaults to +ETH_DATA_LEN. + +This patch fixes this by setting max_mtu to ETH_MAX_MTU after +ether_setup() call. + +Fixes: 91572088e3fd ("net: use core MTU range checking in core net infra") +Signed-off-by: Jarno Rajahalme <jarno@ovn.org> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + net/openvswitch/vport-internal_dev.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c +index 09141a1..89193a6 100644 +--- a/net/openvswitch/vport-internal_dev.c ++++ b/net/openvswitch/vport-internal_dev.c +@@ -149,6 +149,8 @@ static void do_setup(struct net_device *netdev) + { + ether_setup(netdev); + ++ netdev->max_mtu = ETH_MAX_MTU; ++ + netdev->netdev_ops = &internal_dev_netdev_ops; + + netdev->priv_flags &= ~IFF_TX_SKB_SHARING; +-- +cgit v1.1 + |