Commit 82dbbe70 authored by jan.koester's avatar jan.koester
Browse files

final fix now on level 6.6.16

parent 86c310ef

Makefile

+2 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 6

PATCHLEVEL = 6

SUBLEVEL = 0

EXTRAVERSION = -rc5

SUBLEVEL = 16

EXTRAVERSION =

NAME = Hurr durr I'ma ninja sloth



# *DOCUMENTATION*

Makefile.rej

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
--- Makefile

+++ Makefile

@@ -1,7 +1,7 @@

 # SPDX-License-Identifier: GPL-2.0

 VERSION = 6

 PATCHLEVEL = 6

-SUBLEVEL = 0

+SUBLEVEL = 16

 EXTRAVERSION =

 NAME = Hurr durr I'ma ninja sloth

drivers/net/usb/r8152.c

+229 −72

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/sd.c

+36 −3
Original line number Diff line number Diff line
@@ -209,7 +209,8 @@ manage_start_stop_show(struct device *dev, 


	return sysfs_emit(buf, "%u\n",

			  sdp->manage_system_start_stop &&

			  sdp->manage_runtime_start_stop);

			  sdp->manage_runtime_start_stop &&

			  sdp->manage_shutdown);

}

static DEVICE_ATTR_RO(manage_start_stop);
@@ -275,6 +276,35 @@ manage_runtime_start_stop_store(struct device *dev, 
}

static DEVICE_ATTR_RW(manage_runtime_start_stop);



static ssize_t manage_shutdown_show(struct device *dev,

				    struct device_attribute *attr, char *buf)

{

	struct scsi_disk *sdkp = to_scsi_disk(dev);

	struct scsi_device *sdp = sdkp->device;



	return sysfs_emit(buf, "%u\n", sdp->manage_shutdown);

}



static ssize_t manage_shutdown_store(struct device *dev,

				     struct device_attribute *attr,

				     const char *buf, size_t count)

{

	struct scsi_disk *sdkp = to_scsi_disk(dev);

	struct scsi_device *sdp = sdkp->device;

	bool v;



	if (!capable(CAP_SYS_ADMIN))

		return -EACCES;



	if (kstrtobool(buf, &v))

		return -EINVAL;



	sdp->manage_shutdown = v;



	return count;

}

static DEVICE_ATTR_RW(manage_shutdown);



static ssize_t

allow_restart_show(struct device *dev, struct device_attribute *attr, char *buf)

{
@@ -607,6 +637,7 @@ static struct attribute *sd_disk_attrs[] = { 
	&dev_attr_manage_start_stop.attr,

	&dev_attr_manage_system_start_stop.attr,

	&dev_attr_manage_runtime_start_stop.attr,

	&dev_attr_manage_shutdown.attr,

	&dev_attr_protection_type.attr,

	&dev_attr_protection_mode.attr,

	&dev_attr_app_tag_own.attr,
@@ -3824,8 +3855,10 @@ static void sd_shutdown(struct device *dev) 
		sd_sync_cache(sdkp);

	}



	if (system_state != SYSTEM_RESTART &&

	    sdkp->device->manage_system_start_stop) {

	if ((system_state != SYSTEM_RESTART &&

	     sdkp->device->manage_system_start_stop) ||

	    (system_state == SYSTEM_POWER_OFF &&

	     sdkp->device->manage_shutdown)) {

		sd_printk(KERN_NOTICE, sdkp, "Stopping disk\n");

		sd_start_stop_device(sdkp, 0);

	}

include/linux/virtio_net.h

+18 −3
Original line number Diff line number Diff line
@@ -3,8 +3,10 @@ 
#define _LINUX_VIRTIO_NET_H



#include <linux/if_vlan.h>

#include <linux/ip.h>

#include <linux/ipv6.h>

#include <linux/udp.h>

#include <uapi/linux/tcp.h>

#include <uapi/linux/udp.h>

#include <uapi/linux/virtio_net.h>



static inline bool virtio_net_hdr_match_proto(__be16 protocol, __u8 gso_type)
@@ -154,9 +156,22 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb, 
		unsigned int nh_off = p_off;

		struct skb_shared_info *shinfo = skb_shinfo(skb);



		switch (gso_type & ~SKB_GSO_TCP_ECN) {

		case SKB_GSO_UDP:

			/* UFO may not include transport header in gso_size. */

		if (gso_type & SKB_GSO_UDP)

			nh_off -= thlen;

			break;

		case SKB_GSO_UDP_L4:

			if (!(hdr->flags & VIRTIO_NET_HDR_F_NEEDS_CSUM))

				return -EINVAL;

			if (skb->csum_offset != offsetof(struct udphdr, check))

				return -EINVAL;

			if (skb->len - p_off > gso_size * UDP_MAX_SEGMENTS)

				return -EINVAL;

			if (gso_type != SKB_GSO_UDP_L4)

				return -EINVAL;

			break;

		}



		/* Kernel has a special handling for GSO_BY_FRAGS. */

		if (gso_size == GSO_BY_FRAGS)