diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2012-03-02 16:46:39 -0800 |
|---|---|---|
| committer | Stephen Hemminger <shemminger@vyatta.com> | 2012-03-03 09:56:10 -0800 |
| commit | 6f0d227c17e898f5c1a0e015bd3275f56ae23a19 (patch) | |
| tree | 9f40b2f18710e1fee144cc9cff686e18fe6a47cb /src/eths.c | |
| parent | d86431f9a431288b3b9d0bed26303a13cc1875b5 (diff) | |
| download | vyatta-biosdevname-6f0d227c17e898f5c1a0e015bd3275f56ae23a19.tar.gz vyatta-biosdevname-6f0d227c17e898f5c1a0e015bd3275f56ae23a19.zip | |
Update to biosdevname 0.3.11
Manual merge from http://linux.dell.com/biosdevname/biosdevname-0.3.11/
(cherry picked from commit 79066f1bdcb77fa8cfca2d98464257e1e436b58d)
Diffstat (limited to 'src/eths.c')
| -rw-r--r-- | src/eths.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -165,7 +165,7 @@ int unparse_network_device(char *buf, const int size, struct network_device *dev char *s = buf; s += snprintf(s, size-(s-buf), "Kernel name: %s\n", dev->kernel_name); if (!zero_mac(dev->perm_addr)) - s += snprintf(s, size-(s-buf), "Permanant MAC: %s\n", pr_ether(buffer, sizeof(buffer), dev->perm_addr)); + s += snprintf(s, size-(s-buf), "Permanent MAC: %s\n", pr_ether(buffer, sizeof(buffer), dev->perm_addr)); s += snprintf(s, size-(s-buf), "Assigned MAC : %s\n", pr_ether(buffer, sizeof(buffer), dev->dev_addr)); if (drvinfo_valid(dev)) { s += snprintf(s, size-(s-buf), "Driver: %s\n", dev->drvinfo.driver); @@ -201,7 +201,9 @@ int is_ethernet(struct network_device *dev) goto out; const char *nonethernet_drivers[] = { + "bonding", "bridge", + "openvswitch", "tun", }; for (i=0; i<sizeof(nonethernet_drivers)/sizeof(nonethernet_drivers[0]); i++) { |