lede-packages-rs

commit 9ea127d5248da07ffbe5ce003420c6f7ffd2e097
parent 620e8fe8c71f91a67948bae507f961b64e1e618f
Author: Hannu Nyman <hannu.nyman@iki.fi>
Date:   Sun, 20 Mar 2016 17:38:21 +0200

Merge pull request #2527 from commodo/ovs-kernel-patch-fix

openvswitch: fix kernel 4.4 patch for pre-4.4 kernels
Diffstat:
M
net/openvswitch/Makefile
 | 
2
+-
M
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
@@ -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
@@ -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,