From 6cb655eba83233caa4300383915c4059d9c8fdf2 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Sun, 20 Mar 2016 12:19:43 +0200 Subject: [PATCH] openvswitch: fix kernel 4.4 patch for pre-4.4 kernels Signed-off-by: Alexandru Ardelean --- net/openvswitch/Makefile | 2 +- net/openvswitch/patches/0011-kernel-4-4-support.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index 5fc3aa4b2..cb7170fdd 100644 --- 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 faf1777b4..1a492e4bf 100644 --- 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,