summaryrefslogtreecommitdiffstats
path: root/package/bridge-utils/0003-sysfs-write-fixes.patch
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2016-10-27 21:00:03 +0300
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-10-27 21:54:12 +0200
commit7c740bf9c5937cc93746ac0300cb33b8aeb6abf6 (patch)
treed408b3b76436d2a251dbcdb54fcbdf48479359ce /package/bridge-utils/0003-sysfs-write-fixes.patch
parentbe8c8d8d71ec9df826dc5d20d4fea7255f2cb156 (diff)
downloadbuildroot-7c740bf9c5937cc93746ac0300cb33b8aeb6abf6.tar.gz
buildroot-7c740bf9c5937cc93746ac0300cb33b8aeb6abf6.zip
bridge-utils: bump to version 1.6
Drop upstream patches. Change download and homepage to kernel.org, and use .xz tarball. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/bridge-utils/0003-sysfs-write-fixes.patch')
-rw-r--r--package/bridge-utils/0003-sysfs-write-fixes.patch81
1 files changed, 0 insertions, 81 deletions
diff --git a/package/bridge-utils/0003-sysfs-write-fixes.patch b/package/bridge-utils/0003-sysfs-write-fixes.patch
deleted file mode 100644
index a7ff1979f5..0000000000
--- a/package/bridge-utils/0003-sysfs-write-fixes.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit bb9970a9df95837e39d680021b1f73d231e85406
-Author: Stephen Hemminger <shemminger@vyatta.com>
-Date: Tue May 3 09:52:43 2011 -0700
-
- Check error returns from write to sysfs
-
- Add helper function to check write to sysfs files.
-
- Fix incorrect sysfs path in br_set.
-
-[Thomas De Schampheleire: update commit message only]
-Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
-
-diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c
-index aa8bc36..1e83925 100644
---- a/libbridge/libbridge_devif.c
-+++ b/libbridge/libbridge_devif.c
-@@ -280,25 +280,38 @@ fallback:
- return old_get_port_info(brname, port, info);
- }
-
-+static int set_sysfs(const char *path, unsigned long value)
-+{
-+ int fd, ret = 0, cc;
-+ char buf[32];
-+
-+ fd = open(path, O_WRONLY);
-+ if (fd < 0)
-+ return -1;
-+
-+ cc = snprintf(buf, sizeof(buf), "%lu\n", value);
-+ if (write(fd, buf, cc) < 0)
-+ ret = -1;
-+ close(fd);
-+
-+ return ret;
-+}
-+
-
- static int br_set(const char *bridge, const char *name,
- unsigned long value, unsigned long oldcode)
- {
- int ret;
- char path[SYSFS_PATH_MAX];
-- FILE *f;
-
-- snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/%s", bridge, name);
-+ snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge/%s",
-+ bridge, name);
-
-- f = fopen(path, "w");
-- if (f) {
-- ret = fprintf(f, "%ld\n", value);
-- fclose(f);
-- } else {
-+ if ((ret = set_sysfs(path, value)) < 0) {
- /* fallback to old ioctl */
- struct ifreq ifr;
- unsigned long args[4] = { oldcode, value, 0, 0 };
--
-+
- strncpy(ifr.ifr_name, bridge, IFNAMSIZ);
- ifr.ifr_data = (char *) &args;
- ret = ioctl(br_socket_fd, SIOCDEVPRIVATE, &ifr);
-@@ -348,14 +361,10 @@ static int port_set(const char *bridge, const char *ifname,
- {
- int ret;
- char path[SYSFS_PATH_MAX];
-- FILE *f;
-
- snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/brport/%s", ifname, name);
-- f = fopen(path, "w");
-- if (f) {
-- ret = fprintf(f, "%ld\n", value);
-- fclose(f);
-- } else {
-+
-+ if ((ret = set_sysfs(path, value)) < 0) {
- int index = get_portno(bridge, ifname);
-
- if (index < 0)
OpenPOWER on IntegriCloud