remove patch fix-rtnl_bridge_getlink.patch (now upstream)

diff --git a/Makefile b/Makefile
index 2abe2c1bb8032016484a749d606fa18a0555614f..287585b3b55249377fb035e8b8a5b01661f2bca8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -204,7 +204,6 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR}
        tar xf ${KERNELSRCTAR}
        cat ${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${KERNEL_SRC}/debian.master/config/amd64/config.common.amd64 ${KERNEL_SRC}/debian.master/config/amd64/config.flavour.generic > ${KERNEL_CFG_ORG}
        cd ${KERNEL_SRC}; patch -p1 <../add-thp-never-option.patch
-       cd ${KERNEL_SRC}; patch -p1 <../fix-rtnl_bridge_getlink.patch
        cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
        #cd ${KERNEL_SRC}; patch -p1 <../bridge-forward-ipv6-neighbor-solicitation.patch
        #cd ${KERNEL_SRC}; patch -p1 <../add-empty-ndo_poll_controller-to-veth.patch

diff --git a/changelog.Debian b/changelog.Debian
index 4cbaee4af09b91e39d3375aa76cd200c6c805f51..dcd92e581effc631d69163e1c739f55a18e2d5ca 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -2,6 +2,8 @@ pve-kernel (4.2.3-17) unstable; urgency=medium
 
   * update kernel source to Ubuntu-4.2.0-16.19 (rebase to v4.2.3)
 
+  * remove patch fix-rtnl_bridge_getlink.patch (now upsream)
+  
  -- Proxmox Support Team <support@proxmox.com>  Sun, 18 Oct 2015 10:56:49 +0200
 
 pve-kernel (4.2.2-16) unstable; urgency=medium

diff --git a/fix-rtnl_bridge_getlink.patch b/fix-rtnl_bridge_getlink.patch
deleted file mode 100644 (file)
index aaaef66..0000000
--- a/fix-rtnl_bridge_getlink.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From f8b65172fe4f8e6aab8946ba004a7176c0249e1d Mon Sep 17 00:00:00 2001
-From: Alexandre Derumier <aderumier@odiso.com>
-Date: Wed, 16 Sep 2015 08:43:56 +0200
-Subject: [PATCH] fix rtnl_bridge_getlink
-
-Looks like this was due to 85fdb956726ff2a ("switchdev: cut over to new
-switchdev_port_bridge_getlink").
-When CONFIG_SWITCHDEV is off, nodes that use switchdev api for
-ndo_bridge_getlink (example, bonds, teams, rocker) can return
--EOPNOTSUPP. The problem went away on my box with the following patch. I
-will submit an official patch in a bit.
-
-Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
----
- net/core/rtnetlink.c | 27 +++++++++++++++++----------
- 1 file changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
-index dc004b1..9e8cffc 100644
---- a/net/core/rtnetlink.c
-+++ b/net/core/rtnetlink.c
-@@ -3021,6 +3021,7 @@ static int rtnl_bridge_getlink(struct sk_buff *skb, struct netlink_callback *cb)
-       u32 portid = NETLINK_CB(cb->skb).portid;
-       u32 seq = cb->nlh->nlmsg_seq;
-       u32 filter_mask = 0;
-+      int err;
- 
-       if (nlmsg_len(cb->nlh) > sizeof(struct ifinfomsg)) {
-               struct nlattr *extfilt;
-@@ -3041,20 +3042,26 @@ static int rtnl_bridge_getlink(struct sk_buff *skb, struct netlink_callback *cb)
-               struct net_device *br_dev = netdev_master_upper_dev_get(dev);
- 
-               if (br_dev && br_dev->netdev_ops->ndo_bridge_getlink) {
--                      if (idx >= cb->args[0] &&
--                          br_dev->netdev_ops->ndo_bridge_getlink(
--                                  skb, portid, seq, dev, filter_mask,
--                                  NLM_F_MULTI) < 0)
--                              break;
-+                      if (idx >= cb->args[0]) {
-+                              err = br_dev->netdev_ops->ndo_bridge_getlink(
-+                                              skb, portid, seq, dev,
-+                                              filter_mask, NLM_F_MULTI);
-+                              if ( err < 0 && err != -EOPNOTSUPP)
-+                                      break;
-+                      }
-+
-                       idx++;
-               }
- 
-               if (ops->ndo_bridge_getlink) {
--                      if (idx >= cb->args[0] &&
--                          ops->ndo_bridge_getlink(skb, portid, seq, dev,
--                                                  filter_mask,
--                                                  NLM_F_MULTI) < 0)
--                              break;
-+                      if (idx >= cb->args[0]) {
-+                              err = ops->ndo_bridge_getlink(skb, portid,
-+                                                            seq, dev,
-+                                                            filter_mask,
-+                                                            NLM_F_MULTI);
-+                              if ( err < 0 && err != -EOPNOTSUPP)
-+                                      break;
-+                      }
-                       idx++;
-               }
-       }
--- 
-2.1.4
-