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:27 +0200
commit57f49532b0cfdecc6571e638bb3a8cec9543443e (patch)
tree0e6ee8f36655aa97ba13ba5be8e11dcc76682c56
parentcd4ccd3cb465026eea58fb414866af275655d273 (diff)
netvsc: whitespace cleanup (fate#323887).
-rw-r--r--patches.suse/msft-hv-1430-netvsc-whitespace-cleanup.patch65
-rw-r--r--series.conf1
2 files changed, 66 insertions, 0 deletions
diff --git a/patches.suse/msft-hv-1430-netvsc-whitespace-cleanup.patch b/patches.suse/msft-hv-1430-netvsc-whitespace-cleanup.patch
new file mode 100644
index 0000000000..b07c4d98eb
--- /dev/null
+++ b/patches.suse/msft-hv-1430-netvsc-whitespace-cleanup.patch
@@ -0,0 +1,65 @@
+From: stephen hemminger <stephen@networkplumber.org>
+Date: Wed, 9 Aug 2017 17:46:08 -0700
+Patch-mainline: v4.14-rc1
+Subject: netvsc: whitespace cleanup
+Git-commit: 89bb42b11370c2daf19d8820398f7255f8499ab7
+References: fate#323887
+
+Fix some minor indentation issues.
+
+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/net/hyperv/netvsc_drv.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -165,7 +165,7 @@ static int netvsc_close(struct net_device *net)
+ }
+
+ static void *init_ppi_data(struct rndis_message *msg, u32 ppi_size,
+- int pkt_type)
++ int pkt_type)
+ {
+ struct rndis_packet *rndis_pkt;
+ struct rndis_per_packet_info *ppi;
+@@ -286,7 +286,7 @@ static u16 netvsc_select_queue(struct net_device *ndev, struct sk_buff *skb,
+ }
+
+ static u32 fill_pg_buf(struct page *page, u32 offset, u32 len,
+- struct hv_page_buffer *pb)
++ struct hv_page_buffer *pb)
+ {
+ int j = 0;
+
+@@ -626,6 +626,7 @@ no_memory:
+ ++net_device_ctx->eth_stats.tx_no_memory;
+ goto drop;
+ }
++
+ /*
+ * netvsc_linkstatus_callback - Link up/down notification
+ */
+@@ -649,8 +650,8 @@ void netvsc_linkstatus_callback(struct hv_device *device_obj,
+ if (indicate->status == RNDIS_STATUS_LINK_SPEED_CHANGE) {
+ u32 speed;
+
+- speed = *(u32 *)((void *)indicate + indicate->
+- status_buf_offset) / 10000;
++ speed = *(u32 *)((void *)indicate
++ + indicate->status_buf_offset) / 10000;
+ ndev_ctx->speed = speed;
+ return;
+ }
+@@ -1018,7 +1019,7 @@ static void netvsc_get_stats64(struct net_device *net,
+ struct net_device_context *ndev_ctx = netdev_priv(net);
+ struct netvsc_device *nvdev = rcu_dereference_rtnl(ndev_ctx->nvdev);
+ struct netvsc_vf_pcpu_stats vf_tot;
+- int i;
++ int i;
+
+ if (!nvdev)
+ return;
diff --git a/series.conf b/series.conf
index 66ab839002..c944911f3f 100644
--- a/series.conf
+++ b/series.conf
@@ -1680,6 +1680,7 @@
patches.suse/msft-hv-1427-netvsc-propagate-MAC-address-change-to-VF-slave.patch
patches.suse/msft-hv-1428-netvsc-check-error-return-when-restoring-channels-an.patch
patches.suse/msft-hv-1429-netvsc-no-need-to-allocate-send-receive-on-numa-node.patch
+ patches.suse/msft-hv-1430-netvsc-whitespace-cleanup.patch
patches.suse/suse-hv-guest-os-id.patch
patches.suse/suse-hv-kvp_on_msg.dbg.patch