projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'staging-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[cascardo/linux.git]
/
drivers
/
staging
/
octeon
/
ethernet.c
diff --git
a/drivers/staging/octeon/ethernet.c
b/drivers/staging/octeon/ethernet.c
index
af24294
..
ee32149
100644
(file)
--- a/
drivers/staging/octeon/ethernet.c
+++ b/
drivers/staging/octeon/ethernet.c
@@
-98,12
+98,6
@@
MODULE_PARM_DESC(pow_send_list, "\n"
"\t\"eth2,spi3,spi7\" would cause these three devices to transmit\n"
"\tusing the pow_send_group.");
"\t\"eth2,spi3,spi7\" would cause these three devices to transmit\n"
"\tusing the pow_send_group.");
-int max_rx_cpus = -1;
-module_param(max_rx_cpus, int, 0444);
-MODULE_PARM_DESC(max_rx_cpus, "\n"
- "\t\tThe maximum number of CPUs to use for packet reception.\n"
- "\t\tUse -1 to use all available CPUs.");
-
int rx_napi_weight = 32;
module_param(rx_napi_weight, int, 0444);
MODULE_PARM_DESC(rx_napi_weight, "The NAPI WEIGHT parameter.");
int rx_napi_weight = 32;
module_param(rx_napi_weight, int, 0444);
MODULE_PARM_DESC(rx_napi_weight, "The NAPI WEIGHT parameter.");
@@
-452,7
+446,7
@@
int cvm_oct_common_init(struct net_device *dev)
mac = of_get_mac_address(priv->of_node);
if (mac)
mac = of_get_mac_address(priv->of_node);
if (mac)
-
memcpy(dev->dev_addr, mac, ETH_ALEN
);
+
ether_addr_copy(dev->dev_addr, mac
);
else
eth_hw_addr_random(dev);
else
eth_hw_addr_random(dev);