Browse Source

Bump kernel to 4.4.190

RISCi_ATOM 4 years ago
parent
commit
523cd92791

+ 2 - 2
include/kernel-version.mk

@@ -2,9 +2,9 @@
 
 LINUX_RELEASE?=1
 
-LINUX_VERSION-4.4 = .189
+LINUX_VERSION-4.4 = .190
 
-LINUX_KERNEL_HASH-4.4.189 = b089e61a480f26f0009c98a3c5e2b6a4250aa8e5f70164cb746e26daf3f65521
+LINUX_KERNEL_HASH-4.4.190 = 426b4252c6d9518ad400ccb4b3c777672ebe28e14439696775cbe3d2dff088b2
 
 ifdef KERNEL_PATCHVER
   LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))

+ 3 - 3
target/linux/generic/patches-4.4/630-packet_socket_type.patch

@@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	if (!net_eq(dev_net(dev), sock_net(sk)))
  		goto drop;
  
-@@ -3148,6 +3150,7 @@ static int packet_create(struct net *net
+@@ -3155,6 +3157,7 @@ static int packet_create(struct net *net
  	mutex_init(&po->pg_vec_lock);
  	po->rollover = NULL;
  	po->prot_hook.func = packet_rcv;
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  	if (sock->type == SOCK_PACKET)
  		po->prot_hook.func = packet_rcv_spkt;
-@@ -3806,6 +3809,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3813,6 +3816,16 @@ packet_setsockopt(struct socket *sock, i
  		po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
  		return 0;
  	}
@@ -108,7 +108,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	default:
  		return -ENOPROTOOPT;
  	}
-@@ -3858,6 +3871,13 @@ static int packet_getsockopt(struct sock
+@@ -3865,6 +3878,13 @@ static int packet_getsockopt(struct sock
  	case PACKET_VNET_HDR:
  		val = po->has_vnet_hdr;
  		break;