hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/misc/sgi-xp/xpnet.c
....@@ -3,6 +3,7 @@
33 * License. See the file "COPYING" in the main directory of this archive
44 * for more details.
55 *
6
+ * (C) Copyright 2020 Hewlett Packard Enterprise Development LP
67 * Copyright (C) 1999-2009 Silicon Graphics, Inc. All rights reserved.
78 */
89
....@@ -96,7 +97,7 @@
9697 atomic_t use_count;
9798 };
9899
99
-struct net_device *xpnet_device;
100
+static struct net_device *xpnet_device;
100101
101102 /*
102103 * When we are notified of other partitions activating, we add them to
....@@ -131,16 +132,16 @@
131132
132133 /* Define the XPNET debug device structures to be used with dev_dbg() et al */
133134
134
-struct device_driver xpnet_dbg_name = {
135
+static struct device_driver xpnet_dbg_name = {
135136 .name = "xpnet"
136137 };
137138
138
-struct device xpnet_dbg_subname = {
139
+static struct device xpnet_dbg_subname = {
139140 .init_name = "", /* set to "" */
140141 .driver = &xpnet_dbg_name
141142 };
142143
143
-struct device *xpnet = &xpnet_dbg_subname;
144
+static struct device *xpnet = &xpnet_dbg_subname;
144145
145146 /*
146147 * Packet was recevied by XPC and forwarded to us.
....@@ -496,7 +497,7 @@
496497 * Deal with transmit timeouts coming from the network layer.
497498 */
498499 static void
499
-xpnet_dev_tx_timeout(struct net_device *dev)
500
+xpnet_dev_tx_timeout(struct net_device *dev, unsigned int txqueue)
500501 {
501502 dev->stats.tx_errors++;
502503 }
....@@ -515,7 +516,7 @@
515516 {
516517 int result;
517518
518
- if (!is_shub() && !is_uv())
519
+ if (!is_uv_system())
519520 return -ENODEV;
520521
521522 dev_info(xpnet, "registering network device %s\n", XPNET_DEVICE_NAME);