git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Blackfin: includecheck fix: mach-bf548, ezkit.c
[safe/jmp/linux-2.6]
/
net
/
bridge
/
br_if.c
diff --git
a/net/bridge/br_if.c
b/net/bridge/br_if.c
index
f38cc53
..
b1b3b0f
100644
(file)
--- a/
net/bridge/br_if.c
+++ b/
net/bridge/br_if.c
@@
-5,8
+5,6
@@
* Authors:
* Lennert Buytenhek <buytenh@gnu.org>
*
* Authors:
* Lennert Buytenhek <buytenh@gnu.org>
*
- * $Id: br_if.c,v 1.7 2001/12/24 00:59:55 davem Exp $
- *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
@@
-170,7
+168,7
@@
static void del_br(struct net_bridge *br)
unregister_netdevice(br->dev);
}
unregister_netdevice(br->dev);
}
-static struct net_device *new_bridge_dev(const char *name)
+static struct net_device *new_bridge_dev(
struct net *net,
const char *name)
{
struct net_bridge *br;
struct net_device *dev;
{
struct net_bridge *br;
struct net_device *dev;
@@
-180,6
+178,7
@@
static struct net_device *new_bridge_dev(const char *name)
if (!dev)
return NULL;
if (!dev)
return NULL;
+ dev_net_set(dev, net);
br = netdev_priv(dev);
br->dev = dev;
br = netdev_priv(dev);
br->dev = dev;
@@
-204,6
+203,9
@@
static struct net_device *new_bridge_dev(const char *name)
br->topology_change = 0;
br->topology_change_detected = 0;
br->ageing_time = 300 * HZ;
br->topology_change = 0;
br->topology_change_detected = 0;
br->ageing_time = 300 * HZ;
+
+ br_netfilter_rtable_init(br);
+
INIT_LIST_HEAD(&br->age_list);
br_stp_timer_init(br);
INIT_LIST_HEAD(&br->age_list);
br_stp_timer_init(br);
@@
-254,6
+256,7
@@
static struct net_bridge_port *new_nbp(struct net_bridge *br,
p->path_cost = port_cost(dev);
p->priority = 0x8000 >> BR_PORT_BITS;
p->port_no = index;
p->path_cost = port_cost(dev);
p->priority = 0x8000 >> BR_PORT_BITS;
p->port_no = index;
+ p->flags = 0;
br_init_port(p);
p->state = BR_STATE_DISABLED;
br_stp_port_timer_init(p);
br_init_port(p);
p->state = BR_STATE_DISABLED;
br_stp_port_timer_init(p);
@@
-261,12
+264,16
@@
static struct net_bridge_port *new_nbp(struct net_bridge *br,
return p;
}
return p;
}
-int br_add_bridge(const char *name)
+static struct device_type br_type = {
+ .name = "bridge",
+};
+
+int br_add_bridge(struct net *net, const char *name)
{
struct net_device *dev;
int ret;
{
struct net_device *dev;
int ret;
- dev = new_bridge_dev(name);
+ dev = new_bridge_dev(n
et, n
ame);
if (!dev)
return -ENOMEM;
if (!dev)
return -ENOMEM;
@@
-277,6
+284,8
@@
int br_add_bridge(const char *name)
goto out_free;
}
goto out_free;
}
+ SET_NETDEV_DEVTYPE(dev, &br_type);
+
ret = register_netdevice(dev);
if (ret)
goto out_free;
ret = register_netdevice(dev);
if (ret)
goto out_free;
@@
-293,13
+302,13
@@
out_free:
goto out;
}
goto out;
}
-int br_del_bridge(const char *name)
+int br_del_bridge(
struct net *net,
const char *name)
{
struct net_device *dev;
int ret = 0;
rtnl_lock();
{
struct net_device *dev;
int ret = 0;
rtnl_lock();
- dev = __dev_get_by_name(
&init_
net, name);
+ dev = __dev_get_by_name(net, name);
if (dev == NULL)
ret = -ENXIO; /* Could not find device */
if (dev == NULL)
ret = -ENXIO; /* Could not find device */
@@
-345,15
+354,21
@@
int br_min_mtu(const struct net_bridge *br)
void br_features_recompute(struct net_bridge *br)
{
struct net_bridge_port *p;
void br_features_recompute(struct net_bridge *br)
{
struct net_bridge_port *p;
- unsigned long features;
+ unsigned long features, mask;
+
+ features = mask = br->feature_mask;
+ if (list_empty(&br->port_list))
+ goto done;
- features
= br->feature_mask
;
+ features
&= ~NETIF_F_ONE_FOR_ALL
;
list_for_each_entry(p, &br->port_list, list) {
list_for_each_entry(p, &br->port_list, list) {
- features = netdev_compute_features(features, p->dev->features);
+ features = netdev_increment_features(features,
+ p->dev->features, mask);
}
}
- br->dev->features = features;
+done:
+ br->dev->features = netdev_fix_features(features, NULL);
}
/* called with RTNL */
}
/* called with RTNL */
@@
-365,7
+380,7
@@
int br_add_if(struct net_bridge *br, struct net_device *dev)
if (dev->flags & IFF_LOOPBACK || dev->type != ARPHRD_ETHER)
return -EINVAL;
if (dev->flags & IFF_LOOPBACK || dev->type != ARPHRD_ETHER)
return -EINVAL;
- if (dev->
hard
_start_xmit == br_dev_xmit)
+ if (dev->
netdev_ops->ndo
_start_xmit == br_dev_xmit)
return -ELOOP;
if (dev->br_port != NULL)
return -ELOOP;
if (dev->br_port != NULL)
@@
-375,6
+390,10
@@
int br_add_if(struct net_bridge *br, struct net_device *dev)
if (IS_ERR(p))
return PTR_ERR(p);
if (IS_ERR(p))
return PTR_ERR(p);
+ err = dev_set_promiscuity(dev, 1);
+ if (err)
+ goto put_back;
+
err = kobject_init_and_add(&p->kobj, &brport_ktype, &(dev->dev.kobj),
SYSFS_BRIDGE_PORT_ATTR);
if (err)
err = kobject_init_and_add(&p->kobj, &brport_ktype, &(dev->dev.kobj),
SYSFS_BRIDGE_PORT_ATTR);
if (err)
@@
-389,7
+408,7
@@
int br_add_if(struct net_bridge *br, struct net_device *dev)
goto err2;
rcu_assign_pointer(dev->br_port, p);
goto err2;
rcu_assign_pointer(dev->br_port, p);
- dev_
set_promiscuity(dev, 1
);
+ dev_
disable_lro(dev
);
list_add_rcu(&p->list, &br->port_list);
list_add_rcu(&p->list, &br->port_list);
@@
-412,13
+431,13
@@
int br_add_if(struct net_bridge *br, struct net_device *dev)
err2:
br_fdb_delete_by_port(br, p, 1);
err1:
err2:
br_fdb_delete_by_port(br, p, 1);
err1:
- kobject_del(&p->kobj);
- goto put_back;
-err0:
kobject_put(&p->kobj);
kobject_put(&p->kobj);
-
+ p = NULL; /* kobject_put frees */
+err0:
+ dev_set_promiscuity(dev, -1);
put_back:
dev_put(dev);
put_back:
dev_put(dev);
+ kfree(p);
return err;
}
return err;
}
@@
-440,15
+459,15
@@
int br_del_if(struct net_bridge *br, struct net_device *dev)
return 0;
}
return 0;
}
-void
__exit br_cleanup_bridges(void
)
+void
br_net_exit(struct net *net
)
{
struct net_device *dev;
rtnl_lock();
restart:
{
struct net_device *dev;
rtnl_lock();
restart:
- for_each_netdev(
&init_
net, dev) {
+ for_each_netdev(net, dev) {
if (dev->priv_flags & IFF_EBRIDGE) {
if (dev->priv_flags & IFF_EBRIDGE) {
- del_br(
dev->priv
);
+ del_br(
netdev_priv(dev)
);
goto restart;
}
}
goto restart;
}
}