Message ID | 1444069681-23064-1-git-send-email-tim.gardner@canonical.com |
---|---|
State | New |
Headers | show |
I guess we will be told if verification fails for utopic-lts with the 3rd hunk of patch #1 dropped...
On Tue, Oct 06, 2015 at 06:07:18PM +0200, Stefan Bader wrote: > I guess we will be told if verification fails for utopic-lts with the 3rd hunk > of patch #1 dropped... I wonder if 4d3c9d37f77566b04216dfc9a6513082002d7a1f is also needed here.
Adding the scaffold patch 4d3c9d37f77566b04216dfc9a6513082002d7a1f ('hyperv: Add processing of MTU reduced by the host') makes it all a clean cherry-pick (and probably makes the patch series work correctly as well). Good catch. rtg
On Tue, Oct 06, 2015 at 11:29:30AM -0600, tim.gardner@canonical.com wrote: > Adding the scaffold patch 4d3c9d37f77566b04216dfc9a6513082002d7a1f ('hyperv: > Add processing of MTU reduced by the host') makes it all a clean cherry-pick (and > probably makes the patch series work correctly as well). Good catch. That does look better. Acked-by: Seth Forshee <seth.forshee@canonical.com>
On 06.10.2015 19:29, tim.gardner@canonical.com wrote: > Adding the scaffold patch 4d3c9d37f77566b04216dfc9a6513082002d7a1f ('hyperv: > Add processing of MTU reduced by the host') makes it all a clean cherry-pick (and > probably makes the patch series work correctly as well). Good catch. > > rtg > > Yeah, that looks better.
Applied to the lts-backport-utopic-next branch of Trusty.
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h index 6cc37c1..7a72bcb 100644 --- a/drivers/net/hyperv/hyperv_net.h +++ b/drivers/net/hyperv/hyperv_net.h @@ -581,6 +581,7 @@ struct nvsp_message { #define NETVSC_MTU 65536 +#define NETVSC_MTU_MIN 68 #define NETVSC_RECEIVE_BUFFER_SIZE (1024*1024*16) /* 16MB */ #define NETVSC_RECEIVE_BUFFER_SIZE_LEGACY (1024*1024*15) /* 15MB */ diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 7e33318..74266e9 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -692,7 +692,7 @@ static int netvsc_change_mtu(struct net_device *ndev, int mtu) if (nvdev->nvsp_version >= NVSP_PROTOCOL_VERSION_2) limit = NETVSC_MTU; - if (mtu < 68 || mtu > limit) + if (mtu < NETVSC_MTU_MIN || mtu > limit) return -EINVAL; nvdev->start_remove = true;