.. | .. |
---|
3 | 3 | * License. See the file "COPYING" in the main directory of this archive |
---|
4 | 4 | * for more details. |
---|
5 | 5 | * |
---|
| 6 | + * (C) Copyright 2020 Hewlett Packard Enterprise Development LP |
---|
6 | 7 | * Copyright (C) 1999-2009 Silicon Graphics, Inc. All rights reserved. |
---|
7 | 8 | */ |
---|
8 | 9 | |
---|
.. | .. |
---|
96 | 97 | atomic_t use_count; |
---|
97 | 98 | }; |
---|
98 | 99 | |
---|
99 | | -struct net_device *xpnet_device; |
---|
| 100 | +static struct net_device *xpnet_device; |
---|
100 | 101 | |
---|
101 | 102 | /* |
---|
102 | 103 | * When we are notified of other partitions activating, we add them to |
---|
.. | .. |
---|
131 | 132 | |
---|
132 | 133 | /* Define the XPNET debug device structures to be used with dev_dbg() et al */ |
---|
133 | 134 | |
---|
134 | | -struct device_driver xpnet_dbg_name = { |
---|
| 135 | +static struct device_driver xpnet_dbg_name = { |
---|
135 | 136 | .name = "xpnet" |
---|
136 | 137 | }; |
---|
137 | 138 | |
---|
138 | | -struct device xpnet_dbg_subname = { |
---|
| 139 | +static struct device xpnet_dbg_subname = { |
---|
139 | 140 | .init_name = "", /* set to "" */ |
---|
140 | 141 | .driver = &xpnet_dbg_name |
---|
141 | 142 | }; |
---|
142 | 143 | |
---|
143 | | -struct device *xpnet = &xpnet_dbg_subname; |
---|
| 144 | +static struct device *xpnet = &xpnet_dbg_subname; |
---|
144 | 145 | |
---|
145 | 146 | /* |
---|
146 | 147 | * Packet was recevied by XPC and forwarded to us. |
---|
.. | .. |
---|
496 | 497 | * Deal with transmit timeouts coming from the network layer. |
---|
497 | 498 | */ |
---|
498 | 499 | static void |
---|
499 | | -xpnet_dev_tx_timeout(struct net_device *dev) |
---|
| 500 | +xpnet_dev_tx_timeout(struct net_device *dev, unsigned int txqueue) |
---|
500 | 501 | { |
---|
501 | 502 | dev->stats.tx_errors++; |
---|
502 | 503 | } |
---|
.. | .. |
---|
515 | 516 | { |
---|
516 | 517 | int result; |
---|
517 | 518 | |
---|
518 | | - if (!is_shub() && !is_uv()) |
---|
| 519 | + if (!is_uv_system()) |
---|
519 | 520 | return -ENODEV; |
---|
520 | 521 | |
---|
521 | 522 | dev_info(xpnet, "registering network device %s\n", XPNET_DEVICE_NAME); |
---|