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
commitd96e7d02e425c9e66e3187fcf4aae1a9b950a02c (patch)
treee2cddd705efb0c3e98a377aa25ee99e7e76887bf
parentb46e705f7c98b8d10b3c3b5a72166fac61deccba (diff)
vmbus: remove unused vmubs_sendpacket_pagebuffer_ctl
-rw-r--r--patches.suse/msft-hv-1444-vmbus-remove-unused-vmubs_sendpacket_pagebuffer_ctl.patch116
-rw-r--r--series.conf1
2 files changed, 117 insertions, 0 deletions
diff --git a/patches.suse/msft-hv-1444-vmbus-remove-unused-vmubs_sendpacket_pagebuffer_ctl.patch b/patches.suse/msft-hv-1444-vmbus-remove-unused-vmubs_sendpacket_pagebuffer_ctl.patch
new file mode 100644
index 0000000000..7efd1601f2
--- /dev/null
+++ b/patches.suse/msft-hv-1444-vmbus-remove-unused-vmubs_sendpacket_pagebuffer_ctl.patch
@@ -0,0 +1,116 @@
+From: stephen hemminger <stephen@networkplumber.org>
+Date: Wed, 16 Aug 2017 08:56:25 -0700
+Patch-mainline: v4.14-rc1
+Subject: vmbus: remove unused vmubs_sendpacket_pagebuffer_ctl
+Git-commit: 5a668d8cddbe8bf14379ce110c49ca088a1e9fae
+References: fate#323887
+
+The function vmbus_sendpacket_pagebuffer_ctl was never used directly.
+Just have vmbus_send_pagebuffer
+
+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 | 30 ++++++------------------------
+ drivers/net/hyperv/netvsc.c | 10 ++++------
+ include/linux/hyperv.h | 8 --------
+ 3 files changed, 10 insertions(+), 38 deletions(-)
+
+diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
+--- a/drivers/hv/channel.c
++++ b/drivers/hv/channel.c
+@@ -702,16 +702,16 @@ int vmbus_sendpacket(struct vmbus_channel *channel, void *buffer,
+ EXPORT_SYMBOL(vmbus_sendpacket);
+
+ /*
+- * vmbus_sendpacket_pagebuffer_ctl - Send a range of single-page buffer
++ * vmbus_sendpacket_pagebuffer - Send a range of single-page buffer
+ * packets using a GPADL Direct packet type. This interface allows you
+ * to control notifying the host. This will be useful for sending
+ * batched data. Also the sender can control the send flags
+ * explicitly.
+ */
+-int vmbus_sendpacket_pagebuffer_ctl(struct vmbus_channel *channel,
+- struct hv_page_buffer pagebuffers[],
+- u32 pagecount, void *buffer, u32 bufferlen,
+- u64 requestid, u32 flags)
++int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel,
++ struct hv_page_buffer pagebuffers[],
++ u32 pagecount, void *buffer, u32 bufferlen,
++ u64 requestid)
+ {
+ int i;
+ struct vmbus_channel_packet_page_buffer desc;
+@@ -736,7 +736,7 @@ int vmbus_sendpacket_pagebuffer_ctl(struct vmbus_channel *channel,
+
+ /* Setup the descriptor */
+ desc.type = VM_PKT_DATA_USING_GPA_DIRECT;
+- desc.flags = flags;
++ 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;
+@@ -757,24 +757,6 @@ int vmbus_sendpacket_pagebuffer_ctl(struct vmbus_channel *channel,
+
+ return hv_ringbuffer_write(channel, bufferlist, 3);
+ }
+-EXPORT_SYMBOL_GPL(vmbus_sendpacket_pagebuffer_ctl);
+-
+-/*
+- * vmbus_sendpacket_pagebuffer - Send a range of single-page buffer
+- * packets using a GPADL Direct packet type.
+- */
+-int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel,
+- struct hv_page_buffer pagebuffers[],
+- u32 pagecount, void *buffer, u32 bufferlen,
+- u64 requestid)
+-{
+- u32 flags = VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED;
+-
+- return vmbus_sendpacket_pagebuffer_ctl(channel, pagebuffers, pagecount,
+- buffer, bufferlen,
+- requestid, flags);
+-
+-}
+ EXPORT_SYMBOL_GPL(vmbus_sendpacket_pagebuffer);
+
+ /*
+diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
+--- a/drivers/net/hyperv/netvsc.c
++++ b/drivers/net/hyperv/netvsc.c
+@@ -775,12 +775,10 @@ static inline int netvsc_send_pkt(
+ if (packet->cp_partial)
+ pb += packet->rmsg_pgcnt;
+
+- ret = vmbus_sendpacket_pagebuffer_ctl(out_channel,
+- pb, packet->page_buf_cnt,
+- &nvmsg,
+- sizeof(struct nvsp_message),
+- req_id,
+- VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
++ ret = vmbus_sendpacket_pagebuffer(out_channel,
++ pb, packet->page_buf_cnt,
++ &nvmsg, sizeof(nvmsg),
++ req_id);
+ } else {
+ ret = vmbus_sendpacket_ctl(out_channel, &nvmsg,
+ sizeof(struct nvsp_message),
+diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
+--- a/include/linux/hyperv.h
++++ b/include/linux/hyperv.h
+@@ -1044,14 +1044,6 @@ extern int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel,
+ u32 bufferlen,
+ u64 requestid);
+
+-extern int vmbus_sendpacket_pagebuffer_ctl(struct vmbus_channel *channel,
+- struct hv_page_buffer pagebuffers[],
+- u32 pagecount,
+- void *buffer,
+- u32 bufferlen,
+- u64 requestid,
+- u32 flags);
+-
+ 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 cd50a39f84..645b59ed78 100644
--- a/series.conf
+++ b/series.conf
@@ -1694,6 +1694,7 @@
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/msft-hv-1444-vmbus-remove-unused-vmubs_sendpacket_pagebuffer_ctl.patch
patches.suse/suse-hv-guest-os-id.patch
patches.suse/suse-hv-kvp_on_msg.dbg.patch