p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xtensa: ISS: clean up diagnostic, increase verbosity 

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
This commit is contained in:
Max Filippov 2013-11-10 16:05:51 +04:00 committed by Chris Zankel
parent 35e14b443a
commit a6e16b9aaf
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
arch/xtensa/platforms/iss/network.c
View File

@ -165,8 +165,8 @@ static int tuntap_open(struct iss_net_private *lp)
fd = simc_open("/dev/net/tun", 02, 0); /* O_RDWR */ fd = simc_open("/dev/net/tun", 02, 0); /* O_RDWR */
if (fd < 0) { if (fd < 0) {
pr_err("Failed to open /dev/net/tun, returned %d (errno = %d)\n", pr_err("%s: failed to open /dev/net/tun, returned %d (errno = %d)\n",
fd, errno); lp->dev->name, fd, errno);
return fd; return fd;
} }
@ -176,8 +176,8 @@ static int tuntap_open(struct iss_net_private *lp)
err = simc_ioctl(fd, TUNSETIFF, &ifr); err = simc_ioctl(fd, TUNSETIFF, &ifr);
if (err < 0) { if (err < 0) {
pr_err("Failed to set interface, returned %d (errno = %d)\n", pr_err("%s: failed to set interface %s, returned %d (errno = %d)\n",
err, errno); lp->dev->name, dev_name, err, errno);
simc_close(fd); simc_close(fd);
return err; return err;
} }
@ -232,11 +232,13 @@ static int tuntap_probe(struct iss_net_private *lp, int index, char *init)
if (*init == ',') { if (*init == ',') {
rem = split_if_spec(init + 1, &mac_str, &dev_name); rem = split_if_spec(init + 1, &mac_str, &dev_name);
if (rem != NULL) { if (rem != NULL) {
pr_err("Extra garbage on specification : '%s'\n", rem); pr_err("%s: extra garbage on specification : '%s'\n",
dev->name, rem);
return 0; return 0;
} }
} else if (*init != '\0') { } else if (*init != '\0') {
pr_err("Invalid argument: %s. Skipping device!\n", init); pr_err("%s: invalid argument: %s. Skipping device!\n",
dev->name, init);
return 0; return 0;
} }
@ -261,8 +263,6 @@ static int tuntap_probe(struct iss_net_private *lp, int index, char *init)
lp->tp.protocol = tuntap_protocol; lp->tp.protocol = tuntap_protocol;
lp->tp.poll = tuntap_poll; lp->tp.poll = tuntap_poll;
pr_info("TUN/TAP backend -\n");
return 1; return 1;
} }
@ -435,7 +435,7 @@ static int iss_net_start_xmit(struct sk_buff *skb, struct net_device *dev)
} else { } else {
netif_start_queue(dev); netif_start_queue(dev);
pr_err("iss_net_start_xmit: failed(%d)\n", len); pr_err("%s: %s failed(%d)\n", dev->name, __func__, len);
} }
spin_unlock_irqrestore(&lp->lock, flags); spin_unlock_irqrestore(&lp->lock, flags);
@ -538,7 +538,8 @@ static int iss_net_configure(int index, char *init)
*/ */
if (!tuntap_probe(lp, index, init)) { if (!tuntap_probe(lp, index, init)) {
pr_err("Invalid arguments. Skipping device!\n"); pr_err("%s: invalid arguments. Skipping device!\n",
dev->name);
goto errout; goto errout;
} }
@ -570,7 +571,7 @@ static int iss_net_configure(int index, char *init)
rtnl_unlock(); rtnl_unlock();
if (err) { if (err) {
pr_err("Error registering net device!\n"); pr_err("%s: error registering net device!\n", dev->name);
/* XXX: should we call ->remove() here? */ /* XXX: should we call ->remove() here? */
free_netdev(dev); free_netdev(dev);
return 1; return 1;