Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Hering <ohering@suse.de>2017-10-20 12:20:33 +0200
committerOlaf Hering <ohering@suse.de>2017-10-20 12:23:28 +0200
commitb46e705f7c98b8d10b3c3b5a72166fac61deccba (patch)
tree827c7415112643cd53bffdfefe07303882aaa226
parent35b542f7643b794295a9de247eb0ecf4380bb6c5 (diff)
vmbus: remove unused vmbus_sendpacket_multipagebuffer
-rw-r--r--patches.suse/msft-hv-1443-vmbus-remove-unused-vmbus_sendpacket_multipagebuffer.patch99
-rw-r--r--series.conf1
2 files changed, 100 insertions, 0 deletions
diff --git a/patches.suse/msft-hv-1443-vmbus-remove-unused-vmbus_sendpacket_multipagebuffer.patch b/patches.suse/msft-hv-1443-vmbus-remove-unused-vmbus_sendpacket_multipagebuffer.patch
new file mode 100644
index 0000000000..7152fd99fe
--- /dev/null
+++ b/patches.suse/msft-hv-1443-vmbus-remove-unused-vmbus_sendpacket_multipagebuffer.patch
@@ -0,0 +1,99 @@
+From: stephen hemminger <stephen@networkplumber.org>
+Date: Wed, 16 Aug 2017 08:56:24 -0700
+Patch-mainline: v4.14-rc1
+Subject: vmbus: remove unused vmbus_sendpacket_multipagebuffer
+Git-commit: 9a603b8e1136f2b55f780fefbcbf84d31844ff2b
+References: fate#323887
+
+This function is not used anywhere in current code.
+
+Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Acked-by: Olaf Hering <ohering@suse.de>
+---
+ drivers/hv/channel.c | 56 --------------------------------------------------
+ include/linux/hyperv.h | 6 ------
+ 2 files changed, 62 deletions(-)
+
+diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
+--- a/drivers/hv/channel.c
++++ b/drivers/hv/channel.c
+@@ -814,62 +814,6 @@ int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel,
+ }
+ EXPORT_SYMBOL_GPL(vmbus_sendpacket_mpb_desc);
+
+-/*
+- * vmbus_sendpacket_multipagebuffer - Send a multi-page buffer packet
+- * using a GPADL Direct packet type.
+- */
+-int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel,
+- struct hv_multipage_buffer *multi_pagebuffer,
+- void *buffer, u32 bufferlen, u64 requestid)
+-{
+- struct vmbus_channel_packet_multipage_buffer desc;
+- u32 descsize;
+- u32 packetlen;
+- u32 packetlen_aligned;
+- struct kvec bufferlist[3];
+- u64 aligned_data = 0;
+- u32 pfncount = NUM_PAGES_SPANNED(multi_pagebuffer->offset,
+- multi_pagebuffer->len);
+-
+- if (pfncount > MAX_MULTIPAGE_BUFFER_COUNT)
+- return -EINVAL;
+-
+- /*
+- * Adjust the size down since vmbus_channel_packet_multipage_buffer is
+- * the largest size we support
+- */
+- descsize = sizeof(struct vmbus_channel_packet_multipage_buffer) -
+- ((MAX_MULTIPAGE_BUFFER_COUNT - pfncount) *
+- sizeof(u64));
+- packetlen = descsize + bufferlen;
+- packetlen_aligned = ALIGN(packetlen, sizeof(u64));
+-
+-
+- /* Setup the descriptor */
+- desc.type = VM_PKT_DATA_USING_GPA_DIRECT;
+- desc.flags = VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED;
+- desc.dataoffset8 = descsize >> 3; /* in 8-bytes granularity */
+- desc.length8 = (u16)(packetlen_aligned >> 3);
+- desc.transactionid = requestid;
+- desc.rangecount = 1;
+-
+- desc.range.len = multi_pagebuffer->len;
+- desc.range.offset = multi_pagebuffer->offset;
+-
+- memcpy(desc.range.pfn_array, multi_pagebuffer->pfn_array,
+- pfncount * sizeof(u64));
+-
+- bufferlist[0].iov_base = &desc;
+- bufferlist[0].iov_len = descsize;
+- bufferlist[1].iov_base = buffer;
+- bufferlist[1].iov_len = bufferlen;
+- bufferlist[2].iov_base = &aligned_data;
+- bufferlist[2].iov_len = (packetlen_aligned - packetlen);
+-
+- return hv_ringbuffer_write(channel, bufferlist, 3);
+-}
+-EXPORT_SYMBOL_GPL(vmbus_sendpacket_multipagebuffer);
+-
+ /**
+ * vmbus_recvpacket() - Retrieve the user packet on the specified channel
+ * @channel: Pointer to vmbus_channel structure.
+diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
+--- a/include/linux/hyperv.h
++++ b/include/linux/hyperv.h
+@@ -1052,12 +1052,6 @@ extern int vmbus_sendpacket_pagebuffer_ctl(struct vmbus_channel *channel,
+ u64 requestid,
+ u32 flags);
+
+-extern int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel,
+- struct hv_multipage_buffer *mpb,
+- void *buffer,
+- u32 bufferlen,
+- u64 requestid);
+-
+ extern int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel,
+ struct vmbus_packet_mpb_array *mpb,
+ u32 desc_size,
diff --git a/series.conf b/series.conf
index 14743266b7..cd50a39f84 100644
--- a/series.conf
+++ b/series.conf
@@ -1693,6 +1693,7 @@
patches.suse/msft-hv-1440-Tools-hv-fix-snprintf-warning-in-kvp_daemon.patch
patches.suse/msft-hv-1441-Tools-hv-update-buffer-handling-in-hv_fcopy_daemon.patch
patches.suse/msft-hv-1442-Drivers-hv-vmbus-Fix-rescind-handling-issues.patch
+ patches.suse/msft-hv-1443-vmbus-remove-unused-vmbus_sendpacket_multipagebuffer.patch
patches.suse/suse-hv-guest-os-id.patch
patches.suse/suse-hv-kvp_on_msg.dbg.patch