diff options
| author | David S. Miller <davem@davemloft.net> | 2013-10-08 21:52:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-08 21:52:03 -0400 |
| commit | b343ca84b4e3ba65508503333c923a797801a588 (patch) | |
| tree | 6fa2e1e7f1edfb9166dbdf52ec7c0ab415d3ff79 | |
| parent | ff0bfad6a2ed98c89cc91bc88ac223082eb42d4a (diff) | |
| download | linux-b343ca84b4e3ba65508503333c923a797801a588.tar.gz linux-b343ca84b4e3ba65508503333c923a797801a588.tar.bz2 linux-b343ca84b4e3ba65508503333c923a797801a588.zip | |
Revert "veth: Showing peer of veth type dev in ip link (kernel side)"
This reverts commit 612c337306f00dc8d396830212de51c475844791.
As per Stephen Hemminger, the layout of the netlink attribute
is not implemented correctly so revert this for now.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/veth.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index 54187b9c0efc..eee1f19ef1e9 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -434,25 +434,6 @@ static const struct nla_policy veth_policy[VETH_INFO_MAX + 1] = { [VETH_INFO_PEER] = { .len = sizeof(struct ifinfomsg) }, }; -static size_t veth_get_size(const struct net_device *dev) -{ - return nla_total_size(sizeof(u64)) + /* VETH_INFO_PEER */ - 0; -} - -static int veth_fill_info(struct sk_buff *skb, const struct net_device *dev) -{ - struct veth_priv *priv = netdev_priv(dev); - struct net_device *peer = rtnl_dereference(priv->peer); - u64 peer_ifindex; - - peer_ifindex = peer ? peer->ifindex : 0; - if (nla_put_u64(skb, VETH_INFO_PEER, peer_ifindex)) - return -EMSGSIZE; - - return 0; -} - static struct rtnl_link_ops veth_link_ops = { .kind = DRV_NAME, .priv_size = sizeof(struct veth_priv), @@ -462,8 +443,6 @@ static struct rtnl_link_ops veth_link_ops = { .dellink = veth_dellink, .policy = veth_policy, .maxtype = VETH_INFO_MAX, - .get_size = veth_get_size, - .fill_info = veth_fill_info, }; /* |