git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/hns3: fix timing in mailbox
[dpdk.git]
/
drivers
/
net
/
netvsc
/
hn_ethdev.c
diff --git
a/drivers/net/netvsc/hn_ethdev.c
b/drivers/net/netvsc/hn_ethdev.c
index
5a401b4
..
a7b7f15
100644
(file)
--- a/
drivers/net/netvsc/hn_ethdev.c
+++ b/
drivers/net/netvsc/hn_ethdev.c
@@
-12,6
+12,7
@@
#include <dirent.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <dirent.h>
#include <net/if.h>
#include <net/if_arp.h>
+#include <netinet/in.h>
#include <sys/ioctl.h>
#include <rte_ethdev.h>
#include <sys/ioctl.h>
#include <rte_ethdev.h>
@@
-24,7
+25,7
@@
#include <rte_atomic.h>
#include <rte_branch_prediction.h>
#include <rte_ether.h>
#include <rte_atomic.h>
#include <rte_branch_prediction.h>
#include <rte_ether.h>
-#include <
rte_
ethdev_driver.h>
+#include <ethdev_driver.h>
#include <rte_cycles.h>
#include <rte_errno.h>
#include <rte_memory.h>
#include <rte_cycles.h>
#include <rte_errno.h>
#include <rte_memory.h>
@@
-564,7
+565,7
@@
static void netvsc_hotplug_retry(void *args)
struct rte_ether_addr eth_addr;
int s;
struct rte_ether_addr eth_addr;
int s;
- PMD_DRV_LOG(DEBUG, "%s: retry count %d
\n
",
+ PMD_DRV_LOG(DEBUG, "%s: retry count %d",
__func__, hv->eal_hot_plug_retry);
if (hv->eal_hot_plug_retry++ > NETVSC_MAX_HOTADD_RETRY)
__func__, hv->eal_hot_plug_retry);
if (hv->eal_hot_plug_retry++ > NETVSC_MAX_HOTADD_RETRY)
@@
-574,7
+575,7
@@
static void netvsc_hotplug_retry(void *args)
di = opendir(buf);
if (!di) {
PMD_DRV_LOG(DEBUG, "%s: can't open directory %s, "
di = opendir(buf);
if (!di) {
PMD_DRV_LOG(DEBUG, "%s: can't open directory %s, "
- "retrying in 1 second
\n
", __func__, buf);
+ "retrying in 1 second", __func__, buf);
goto retry;
}
goto retry;
}
@@
-586,7
+587,7
@@
static void netvsc_hotplug_retry(void *args)
/* trying to get mac address if this is a network device*/
s = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
if (s == -1) {
/* trying to get mac address if this is a network device*/
s = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
if (s == -1) {
- PMD_DRV_LOG(ERR, "Failed to create socket errno %d
\n
",
+ PMD_DRV_LOG(ERR, "Failed to create socket errno %d",
errno);
break;
}
errno);
break;
}
@@
-594,8
+595,9
@@
static void netvsc_hotplug_retry(void *args)
ret = ioctl(s, SIOCGIFHWADDR, &req);
close(s);
if (ret == -1) {
ret = ioctl(s, SIOCGIFHWADDR, &req);
close(s);
if (ret == -1) {
- PMD_DRV_LOG(ERR, "Failed to send SIOCGIFHWADDR for "
- "device %s\n", dir->d_name);
+ PMD_DRV_LOG(ERR,
+ "Failed to send SIOCGIFHWADDR for device %s",
+ dir->d_name);
break;
}
if (req.ifr_hwaddr.sa_family != ARPHRD_ETHER) {
break;
}
if (req.ifr_hwaddr.sa_family != ARPHRD_ETHER) {
@@
-606,14
+608,14
@@
static void netvsc_hotplug_retry(void *args)
RTE_DIM(eth_addr.addr_bytes));
if (rte_is_same_ether_addr(ð_addr, dev->data->mac_addrs)) {
RTE_DIM(eth_addr.addr_bytes));
if (rte_is_same_ether_addr(ð_addr, dev->data->mac_addrs)) {
- PMD_DRV_LOG(NOTICE,
"Found matching MAC address, "
- "
adding device %s network name %s\n
",
+ PMD_DRV_LOG(NOTICE,
+ "
Found matching MAC address, adding device %s network name %s
",
d->name, dir->d_name);
ret = rte_eal_hotplug_add(d->bus->name, d->name,
d->args);
if (ret) {
PMD_DRV_LOG(ERR,
d->name, dir->d_name);
ret = rte_eal_hotplug_add(d->bus->name, d->name,
d->args);
if (ret) {
PMD_DRV_LOG(ERR,
- "Failed to add PCI device %s
\n
",
+ "Failed to add PCI device %s",
d->name);
break;
}
d->name);
break;
}
@@
-638,7
+640,7
@@
netvsc_hotadd_callback(const char *device_name, enum rte_dev_event_type type,
struct rte_devargs *d = &hv->devargs;
int ret;
struct rte_devargs *d = &hv->devargs;
int ret;
- PMD_DRV_LOG(INFO, "Device notification type=%d device_name=%s
\n
",
+ PMD_DRV_LOG(INFO, "Device notification type=%d device_name=%s",
type, device_name);
switch (type) {
type, device_name);
switch (type) {
@@
-650,7
+652,7
@@
netvsc_hotadd_callback(const char *device_name, enum rte_dev_event_type type,
ret = rte_devargs_parse(d, device_name);
if (ret) {
PMD_DRV_LOG(ERR,
ret = rte_devargs_parse(d, device_name);
if (ret) {
PMD_DRV_LOG(ERR,
- "devargs parsing failed ret=%d
\n
", ret);
+ "devargs parsing failed ret=%d", ret);
return;
}
return;
}
@@
-961,7
+963,7
@@
hn_dev_start(struct rte_eth_dev *dev)
error = rte_dev_event_callback_register(NULL, netvsc_hotadd_callback,
hv);
if (error) {
error = rte_dev_event_callback_register(NULL, netvsc_hotadd_callback,
hv);
if (error) {
- PMD_DRV_LOG(ERR, "failed to register device event callback
\n
");
+ PMD_DRV_LOG(ERR, "failed to register device event callback");
return error;
}
return error;
}
@@
-1240,7
+1242,7
@@
static int eth_hn_probe(struct rte_vmbus_driver *drv __rte_unused,
ret = rte_dev_event_monitor_start();
if (ret) {
ret = rte_dev_event_monitor_start();
if (ret) {
- PMD_DRV_LOG(ERR, "Failed to start device event monitoring
\n
");
+ PMD_DRV_LOG(ERR, "Failed to start device event monitoring");
return ret;
}
return ret;
}