git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
net
/
bridge
/
br_device.c
diff --git
a/net/bridge/br_device.c
b/net/bridge/br_device.c
index
44a9762
..
f564ee9
100644
(file)
--- a/
net/bridge/br_device.c
+++ b/
net/bridge/br_device.c
@@
-21,10
+21,7
@@
static struct net_device_stats *br_dev_get_stats(struct net_device *dev)
{
static struct net_device_stats *br_dev_get_stats(struct net_device *dev)
{
- struct net_bridge *br;
-
- br = dev->priv;
-
+ struct net_bridge *br = netdev_priv(dev);
return &br->statistics;
}
return &br->statistics;
}
@@
-54,9
+51,11
@@
int br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
static int br_dev_open(struct net_device *dev)
{
static int br_dev_open(struct net_device *dev)
{
-
netif_start_queue
(dev);
+
struct net_bridge *br = netdev_priv
(dev);
- br_stp_enable_bridge(dev->priv);
+ br_features_recompute(br);
+ netif_start_queue(dev);
+ br_stp_enable_bridge(br);
return 0;
}
return 0;
}
@@
-67,7
+66,7
@@
static void br_dev_set_multicast_list(struct net_device *dev)
static int br_dev_stop(struct net_device *dev)
{
static int br_dev_stop(struct net_device *dev)
{
- br_stp_disable_bridge(
dev->priv
);
+ br_stp_disable_bridge(
netdev_priv(dev)
);
netif_stop_queue(dev);
netif_stop_queue(dev);
@@
-76,18
+75,13
@@
static int br_dev_stop(struct net_device *dev)
static int br_change_mtu(struct net_device *dev, int new_mtu)
{
static int br_change_mtu(struct net_device *dev, int new_mtu)
{
- if (
(new_mtu < 68) || new_mtu > br_min_mtu(dev->priv
))
+ if (
new_mtu < 68 || new_mtu > br_min_mtu(netdev_priv(dev)
))
return -EINVAL;
dev->mtu = new_mtu;
return 0;
}
return -EINVAL;
dev->mtu = new_mtu;
return 0;
}
-static int br_dev_accept_fastpath(struct net_device *dev, struct dst_entry *dst)
-{
- return -1;
-}
-
void br_dev_setup(struct net_device *dev)
{
memset(dev->dev_addr, 0, ETH_ALEN);
void br_dev_setup(struct net_device *dev)
{
memset(dev->dev_addr, 0, ETH_ALEN);
@@
-103,7
+97,6
@@
void br_dev_setup(struct net_device *dev)
dev->destructor = free_netdev;
SET_MODULE_OWNER(dev);
dev->stop = br_dev_stop;
dev->destructor = free_netdev;
SET_MODULE_OWNER(dev);
dev->stop = br_dev_stop;
- dev->accept_fastpath = br_dev_accept_fastpath;
dev->tx_queue_len = 0;
dev->set_mac_address = NULL;
dev->priv_flags = IFF_EBRIDGE;
dev->tx_queue_len = 0;
dev->set_mac_address = NULL;
dev->priv_flags = IFF_EBRIDGE;