Linux v4.8-rc2-232-g3408fef
This commit is contained in:
Justin M. Forbes
parent
b0aef6661d
commit
a5acca3c59
2
gitrev
2
gitrev
|
|
@ -1 +1 @@
|
|||
5ff132c07aa155d759ab3da946c86351313d3020
|
||||
3408fef7448ce7d3c926978ee1a511e7707bffba
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ Summary: The Linux kernel
|
|||
# The rc snapshot level
|
||||
%define rcrev 2
|
||||
# The git snapshot level
|
||||
%define gitrev 2
|
||||
%define gitrev 3
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 4.%{upstream_sublevel}.0
|
||||
%endif
|
||||
|
|
@ -602,9 +602,6 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
|
|||
# https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org/message/A4YCP7OGMX6JLFT5V44H57GOMAQLC3M4/
|
||||
Patch839: drm-i915-Acquire-audio-powerwell-for-HD-Audio-regist.patch
|
||||
|
||||
#rhbz 1361414
|
||||
Patch841: openstack_fix.patch
|
||||
|
||||
#rhbz 1200901 (There should be something better upstream at some point)
|
||||
Patch842: qxl-reapply-cursor-after-SetCrtc-calls.patch
|
||||
|
||||
|
|
@ -2145,6 +2142,9 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Fri Aug 19 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc2.git3.1
|
||||
- Linux v4.8-rc2-232-g3408fef
|
||||
|
||||
* Fri Aug 19 2016 Peter Robinson <pbrobinson@fedoraproject.org>
|
||||
- Minor Tegra changes
|
||||
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
From 5ef9f289c4e698054e5687edb54f0da3cdc9173a Mon Sep 17 00:00:00 2001
|
||||
From: Ian Wienand <iwienand@redhat.com>
|
||||
Date: Wed, 3 Aug 2016 15:44:57 +1000
|
||||
Subject: OVS: Ignore negative headroom value
|
||||
|
||||
net_device->ndo_set_rx_headroom (introduced in
|
||||
871b642adebe300be2e50aa5f65a418510f636ec) says
|
||||
|
||||
"Setting a negtaive value reset the rx headroom
|
||||
to the default value".
|
||||
|
||||
It seems that the OVS implementation in
|
||||
3a927bc7cf9d0fbe8f4a8189dd5f8440228f64e7 overlooked this and sets
|
||||
dev->needed_headroom unconditionally.
|
||||
|
||||
This doesn't have an immediate effect, but can mess up later
|
||||
LL_RESERVED_SPACE calculations, such as done in
|
||||
net/ipv6/mcast.c:mld_newpack. For reference, this issue was found
|
||||
from a skb_panic raised there after the length calculations had given
|
||||
the wrong result.
|
||||
|
||||
Note the other current users of this interface
|
||||
(drivers/net/tun.c:tun_set_headroom and
|
||||
drivers/net/veth.c:veth_set_rx_headroom) are both checking this
|
||||
correctly thus need no modification.
|
||||
|
||||
Thanks to Ben for some pointers from the crash dumps!
|
||||
|
||||
Cc: Benjamin Poirier <bpoirier@suse.com>
|
||||
Cc: Paolo Abeni <pabeni@redhat.com>
|
||||
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1361414
|
||||
Signed-off-by: Ian Wienand <iwienand@redhat.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
net/openvswitch/vport-internal_dev.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
|
||||
index 434e04c..95c3614 100644
|
||||
--- a/net/openvswitch/vport-internal_dev.c
|
||||
+++ b/net/openvswitch/vport-internal_dev.c
|
||||
@@ -140,7 +140,7 @@ internal_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats)
|
||||
|
||||
static void internal_set_rx_headroom(struct net_device *dev, int new_hr)
|
||||
{
|
||||
- dev->needed_headroom = new_hr;
|
||||
+ dev->needed_headroom = new_hr < 0 ? 0 : new_hr;
|
||||
}
|
||||
|
||||
static const struct net_device_ops internal_dev_netdev_ops = {
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
Loading…
Reference in New Issue