From 3c5101f82133ff5ecd81891c37f03732778ea0b4 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 19 Apr 2014 14:04:21 +0200
Subject: [PATCH] Update netifd again

---
 ...ts-dependencies-from-Barrier-Breaker.patch |  6 ++--
 .../0019-netifd-fix-proto-none-crash.patch    | 35 -------------------
 2 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 patches/openwrt/0019-netifd-fix-proto-none-crash.patch

diff --git a/patches/openwrt/0002-Update-netifd-and-its-dependencies-from-Barrier-Breaker.patch b/patches/openwrt/0002-Update-netifd-and-its-dependencies-from-Barrier-Breaker.patch
index e5ea0c7c..fa6dfcdb 100644
--- a/patches/openwrt/0002-Update-netifd-and-its-dependencies-from-Barrier-Breaker.patch
+++ b/patches/openwrt/0002-Update-netifd-and-its-dependencies-from-Barrier-Breaker.patch
@@ -60,7 +60,7 @@ index bcf4481..fc9834a 100644
  $(eval $(call BuildPackage,libjson-script))
 +$(eval $(call BuildPackage,libubox-lua))
 diff --git a/package/netifd/Makefile b/package/netifd/Makefile
-index 5f2ee03..21137d0 100644
+index 5f2ee03..1d7f363 100644
 --- a/package/netifd/Makefile
 +++ b/package/netifd/Makefile
 @@ -1,13 +1,13 @@
@@ -68,7 +68,7 @@ index 5f2ee03..21137d0 100644
  
  PKG_NAME:=netifd
 -PKG_VERSION:=2013-07-16
-+PKG_VERSION:=2014-04-11
++PKG_VERSION:=2014-04-19
  PKG_RELEASE=$(PKG_SOURCE_VERSION)
  
  PKG_SOURCE_PROTO:=git
@@ -76,7 +76,7 @@ index 5f2ee03..21137d0 100644
 +PKG_SOURCE_URL:=http://git.openwrt.org/project/netifd.git
  PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 -PKG_SOURCE_VERSION:=2674941b06c1ec67f1aff1bff9212e1372106641
-+PKG_SOURCE_VERSION:=d2a33f3f0fe704e4396fa2ada08401cb955ba7cb
++PKG_SOURCE_VERSION:=ede9739fe90f5da09f14481d10a4f11c000072de
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
  PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
  # PKG_MIRROR_MD5SUM:=
diff --git a/patches/openwrt/0019-netifd-fix-proto-none-crash.patch b/patches/openwrt/0019-netifd-fix-proto-none-crash.patch
deleted file mode 100644
index 2b06d50b..00000000
--- a/patches/openwrt/0019-netifd-fix-proto-none-crash.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 19 Apr 2014 05:45:51 +0200
-Subject: netifd: fix proto none crash
-
-diff --git a/package/netifd/patches/002-fix_proto_none_crash.patch b/package/netifd/patches/002-fix_proto_none_crash.patch
-new file mode 100644
-index 0000000..8def2a0
---- /dev/null
-+++ b/package/netifd/patches/002-fix_proto_none_crash.patch
-@@ -0,0 +1,25 @@
-+--- a/proto.c
-++++ b/proto.c
-+@@ -503,6 +503,22 @@ static int
-+ no_proto_handler(struct interface_proto_state *proto,
-+ 		 enum interface_proto_cmd cmd, bool force)
-+ {
-++	struct interface *iface;
-++	struct device *dev;
-++
-++	switch (cmd) {
-++	case PROTO_CMD_SETUP:
-++		iface = proto->iface;
-++		dev = iface->main_dev.dev;
-++
-++		interface_set_l3_dev(iface, dev);
-++
-++		break;
-++	case PROTO_CMD_TEARDOWN:
-++	case PROTO_CMD_RENEW:
-++		break;
-++	}
-++
-+ 	return 0;
-+ }
-+