openvswitch: fix kernel 4.4 patch for pre-4.4 kernels

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>

diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile
index 5fc3aa4b2d42192e524eb2342a895db219a2f7ce..cb7170fddb7c48634b74643ed644240c96e277f2 100644 (file)
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=openvswitch
 
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 PKG_VERSION:=2.5.0
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_LICENSE:=Apache-2.0

diff --git a/net/openvswitch/patches/0011-kernel-4-4-support.patch b/net/openvswitch/patches/0011-kernel-4-4-support.patch
index faf1777b411bb9d8dbd61c478c2d7a1a714ecd58..1a492e4bfc728ca050b79f8843bbcf57e6f2320b 100644 (file)
--- a/net/openvswitch/patches/0011-kernel-4-4-support.patch
+++ b/net/openvswitch/patches/0011-kernel-4-4-support.patch
@@ -129,8 +129,8 @@ index cd87bcc..b749301 100644
        unsigned int mtu = ip_skb_dst_mtu(skb);
        struct iphdr *iph = ip_hdr(skb);
        struct rtable *rt = skb_rtable(skb);
-+      NET_DECLARE_INIT(net, dev_net(dev));
        struct net_device *dev = rt->dst.dev;
++      NET_DECLARE_INIT(net, dev_net(dev));
  
        if (unlikely(((iph->frag_off & htons(IP_DF)) && !skb->ignore_df) ||
 @@ -102,7 +115,7 @@ static inline int rpl_ip_do_fragment(struct sock *sk, struct sk_buff *skb,