From 71d7ad88c55a7a1cc0293a021c3bf6b598f68288 Mon Sep 17 00:00:00 2001
From: lean <coolsnowwolf@gmail.com>
Date: Fri, 25 Feb 2022 23:37:37 +0800
Subject: [PATCH] ksmbd: bump version

---
 package/kernel/ksmbd/Makefile                         | 11 ++++++-----
 package/lean/shortcut-fe/fast-classifier/Makefile     |  2 +-
 .../shortcut-fe/fast-classifier/src/fast-classifier.c |  4 +++-
 package/lean/shortcut-fe/shortcut-fe/Makefile         |  2 +-
 package/lean/shortcut-fe/shortcut-fe/src/sfe_cm.c     |  5 ++++-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/package/kernel/ksmbd/Makefile b/package/kernel/ksmbd/Makefile
index 842a22c82..24b3d89fc 100644
--- a/package/kernel/ksmbd/Makefile
+++ b/package/kernel/ksmbd/Makefile
@@ -1,13 +1,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ksmbd
-PKG_VERSION:=3.4.3
+PKG_VERSION:=3.4.4
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/cifsd-team/cifsd/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=a910c55d9e6924775e00504eddd00b49788603af29d0772cb9fb6722c189f628
+PKG_HASH:=694960bd0c01de8c4dba0087515343875e6b29bc11bb6b663b8499c66fe0f842
 
+PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
 
@@ -36,8 +37,8 @@ define KernelPackage/fs-ksmbd
 		+kmod-crypto-aead \
 		+kmod-crypto-ccm \
 		+kmod-crypto-gcm \
-		+kmod-asn1-decoder \
-		+kmod-oid-registry
+		+kmod-fs-nfsd \
+		+kmod-nf-nathelper-extra
 endef
 
 # The last two DEPENDS are hacks in order to get CONFIG_ASN1 and CONFIG_OID_REGISTRY
@@ -70,4 +71,4 @@ define Build/Compile
 	modules
 endef
 
-$(eval $(call KernelPackage,fs-ksmbd))
+$(eval $(call KernelPackage,fs-ksmbd))
\ No newline at end of file
diff --git a/package/lean/shortcut-fe/fast-classifier/Makefile b/package/lean/shortcut-fe/fast-classifier/Makefile
index ccd659f20..e62df6cea 100644
--- a/package/lean/shortcut-fe/fast-classifier/Makefile
+++ b/package/lean/shortcut-fe/fast-classifier/Makefile
@@ -16,7 +16,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=fast-classifier
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/lean/shortcut-fe/fast-classifier/src/fast-classifier.c b/package/lean/shortcut-fe/fast-classifier/src/fast-classifier.c
index 085bd0f73..1deb1eb5f 100644
--- a/package/lean/shortcut-fe/fast-classifier/src/fast-classifier.c
+++ b/package/lean/shortcut-fe/fast-classifier/src/fast-classifier.c
@@ -451,7 +451,9 @@ static u32 fc_conn_hash(sfe_ip_addr_t *saddr, sfe_ip_addr_t *daddr,
  */
 static int fast_classifier_update_protocol(struct sfe_connection_create *p_sic, struct nf_conn *ct)
 {
-	struct net *net=NULL ;
+  #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) 
+    struct net *net=NULL ;
+	#endif
 	switch (p_sic->protocol) {
 	case IPPROTO_TCP:
 		p_sic->src_td_window_scale = ct->proto.tcp.seen[0].td_scale;
diff --git a/package/lean/shortcut-fe/shortcut-fe/Makefile b/package/lean/shortcut-fe/shortcut-fe/Makefile
index 842e6a8f6..5712fe676 100644
--- a/package/lean/shortcut-fe/shortcut-fe/Makefile
+++ b/package/lean/shortcut-fe/shortcut-fe/Makefile
@@ -16,7 +16,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=shortcut-fe
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/lean/shortcut-fe/shortcut-fe/src/sfe_cm.c b/package/lean/shortcut-fe/shortcut-fe/src/sfe_cm.c
index eab7572c0..3c68ff37f 100644
--- a/package/lean/shortcut-fe/shortcut-fe/src/sfe_cm.c
+++ b/package/lean/shortcut-fe/shortcut-fe/src/sfe_cm.c
@@ -311,7 +311,10 @@ static unsigned int sfe_cm_post_routing(struct sk_buff *skb, int is_v4)
 	struct nf_conntrack_tuple reply_tuple;
 	struct sk_buff *tmp_skb = NULL;
 	SFE_NF_CONN_ACCT(acct);
-	struct net *net=NULL;
+	
+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
+    struct net *net=NULL;
+	#endif
 
 	/*
 	 * Don't process broadcast or multicast packets.