diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-08-04 10:23:17 -0700 |
|---|---|---|
| committer | Stephen Hemminger <shemminger@osdl.org> | 2006-08-04 10:23:17 -0700 |
| commit | cd38c7590d3cd1d1d068b394558e6070cb926e12 (patch) | |
| tree | 83ebf434b0ccfee2c6c30cf9232f068e82b755e9 /libbridge | |
| parent | 39af7c8f2855c3d9cb44e3069cbfeddd8979acae (diff) | |
| download | android_external_brctl-cd38c7590d3cd1d1d068b394558e6070cb926e12.tar.gz android_external_brctl-cd38c7590d3cd1d1d068b394558e6070cb926e12.tar.bz2 android_external_brctl-cd38c7590d3cd1d1d068b394558e6070cb926e12.zip | |
Revert "Add support for bridge port forwarding."
This reverts 39af7c8f2855c3d9cb44e3069cbfeddd8979acae commit.
Better to add this functionality via ebtables rather than
into bridging code.
Diffstat (limited to 'libbridge')
| -rw-r--r-- | libbridge/libbridge.h | 3 | ||||
| -rw-r--r-- | libbridge/libbridge_if.c | 28 |
2 files changed, 0 insertions, 31 deletions
diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h index 8ee94cf..20d5bb5 100644 --- a/libbridge/libbridge.h +++ b/libbridge/libbridge.h @@ -95,9 +95,6 @@ extern int br_add_bridge(const char *brname); extern int br_del_bridge(const char *brname); extern int br_add_interface(const char *br, const char *dev); extern int br_del_interface(const char *br, const char *dev); -extern int br_set_mirror(const char *bridge, const char *dev); -extern int br_remove_mirror(const char *bridge, const char *dev); - extern int br_set_bridge_forward_delay(const char *br, struct timeval *tv); extern int br_set_bridge_hello_time(const char *br, struct timeval *tv); extern int br_set_bridge_max_age(const char *br, struct timeval *tv); diff --git a/libbridge/libbridge_if.c b/libbridge/libbridge_if.c index b184c46..77d3f8a 100644 --- a/libbridge/libbridge_if.c +++ b/libbridge/libbridge_if.c @@ -115,31 +115,3 @@ int br_del_interface(const char *bridge, const char *dev) return err < 0 ? errno : 0; } - -int br_set_mirror(const char *bridge, const char *dev) -{ - struct ifreq ifr; - int ifindex = if_nametoindex(dev); - - if (ifindex == 0) - return ENODEV; - - strncpy(ifr.ifr_name, bridge, IFNAMSIZ); - ifr.ifr_ifindex = ifindex; - - return ioctl(br_socket_fd, SIOCBRADDMIRROR, &ifr); -} - -int br_remove_mirror(const char *bridge, const char *dev) -{ - struct ifreq ifr; - int ifindex = if_nametoindex(dev); - - if (ifindex == 0) - return ENODEV; - - strncpy(ifr.ifr_name, bridge, IFNAMSIZ); - ifr.ifr_ifindex = ifindex; - - return ioctl(br_socket_fd, SIOCBRDELMIRROR, &ifr); -} |