diff options
| author | shemminger <shemminger> | 2004-05-27 16:50:56 +0000 |
|---|---|---|
| committer | shemminger <shemminger> | 2004-05-27 16:50:56 +0000 |
| commit | 9c6f7c3bed7fa9e42ec2ae4b00d3f6a6ba22d072 (patch) | |
| tree | ec8bdc8b74f7ac95a15514005aa3acfb35b9d955 /libbridge | |
| parent | a5916bc7d089f194febd28fe1d0592314ef1ffc7 (diff) | |
| download | android_external_brctl-9c6f7c3bed7fa9e42ec2ae4b00d3f6a6ba22d072.tar.gz android_external_brctl-9c6f7c3bed7fa9e42ec2ae4b00d3f6a6ba22d072.tar.bz2 android_external_brctl-9c6f7c3bed7fa9e42ec2ae4b00d3f6a6ba22d072.zip | |
Fix issues found testing on earlier 2.6 systems
Diffstat (limited to 'libbridge')
| -rw-r--r-- | libbridge/libbridge_devif.c | 6 | ||||
| -rw-r--r-- | libbridge/libbridge_if.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c index baf450b..665fbec 100644 --- a/libbridge/libbridge_devif.c +++ b/libbridge/libbridge_devif.c @@ -58,7 +58,7 @@ static struct sysfs_directory *bridge_sysfs_directory(const char *devname, snprintf(path, SYSFS_PATH_MAX, "%s/%s", dev->path, subname); sdir = sysfs_open_directory(path); if (!sdir) - fprintf(stderr, "Can't open directory: %s\n", path); + dprintf("can't open directory: %s\n", path); return sdir; } @@ -277,7 +277,7 @@ int br_add_interface(const char *bridge, int ifindex) #ifdef SIOCBRADDIF ifr.ifr_ifindex = ifindex; err = ioctl(br_socket_fd, SIOCBRADDIF, &ifr); - if (err < 0 && errno == EOPNOTSUPP) + if (err < 0) #endif { unsigned long args[4] = { BRCTL_ADD_IF, ifindex, 0, 0 }; @@ -298,7 +298,7 @@ int br_del_interface(const char *bridge, int ifindex) #ifdef SIOCBRDELIF ifr.ifr_ifindex = ifindex; err = ioctl(br_socket_fd, SIOCBRDELIF, &ifr); - if (err < 0 && errno == EOPNOTSUPP) + if (err < 0) #endif { unsigned long args[4] = { BRCTL_DEL_IF, ifindex, 0, 0 }; diff --git a/libbridge/libbridge_if.c b/libbridge/libbridge_if.c index 9eff89b..5a31f0e 100644 --- a/libbridge/libbridge_if.c +++ b/libbridge/libbridge_if.c @@ -33,7 +33,7 @@ int br_add_bridge(const char *brname) #ifdef SIOCBRADDBR ret = ioctl(br_socket_fd, SIOCBRADDBR, brname); - if (ret < 0 && errno == -EOPNOTSUPP) + if (ret < 0) #endif { char _br[IFNAMSIZ]; @@ -53,7 +53,7 @@ int br_del_bridge(const char *brname) #ifdef SIOCBRDELBR ret = ioctl(br_socket_fd, SIOCBRDELBR, brname); - if (ret < 0 && errno == -EOPNOTSUPP) + if (ret < 0) #endif { char _br[IFNAMSIZ]; |