Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 121516
b: refs/heads/master
c: 3717746
h: refs/heads/master
v: v3
  • Loading branch information
Daniel Lezcano authored and David S. Miller committed Oct 29, 2008
1 parent 9e23ce5 commit 0882dfa
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bb7bba3d56963be59bc6764c8021290ed55205ad
refs/heads/master: 3717746ef8b5a9279281b5d318496710984ed739
13 changes: 0 additions & 13 deletions trunk/drivers/net/veth.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
*
*/

#include <linux/list.h>
#include <linux/netdevice.h>
#include <linux/ethtool.h>
#include <linux/etherdevice.h>
Expand All @@ -30,13 +29,10 @@ struct veth_net_stats {

struct veth_priv {
struct net_device *peer;
struct list_head list;
struct veth_net_stats *stats;
unsigned ip_summed;
};

static LIST_HEAD(veth_list);

/*
* ethtool interface
*/
Expand Down Expand Up @@ -420,11 +416,9 @@ static int veth_newlink(struct net_device *dev,

priv = netdev_priv(dev);
priv->peer = peer;
list_add(&priv->list, &veth_list);

priv = netdev_priv(peer);
priv->peer = dev;
INIT_LIST_HEAD(&priv->list);
return 0;

err_register_dev:
Expand All @@ -446,13 +440,6 @@ static void veth_dellink(struct net_device *dev)
priv = netdev_priv(dev);
peer = priv->peer;

if (!list_empty(&priv->list))
list_del(&priv->list);

priv = netdev_priv(peer);
if (!list_empty(&priv->list))
list_del(&priv->list);

unregister_netdevice(dev);
unregister_netdevice(peer);
}
Expand Down

0 comments on commit 0882dfa

Please sign in to comment.