Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

-21
-21
drivers/net/veth.c
··· 434 434 [VETH_INFO_PEER] = { .len = sizeof(struct ifinfomsg) }, 435 435 }; 436 436 437 - static size_t veth_get_size(const struct net_device *dev) 438 - { 439 - return nla_total_size(sizeof(u64)) + /* VETH_INFO_PEER */ 440 - 0; 441 - } 442 - 443 - static int veth_fill_info(struct sk_buff *skb, const struct net_device *dev) 444 - { 445 - struct veth_priv *priv = netdev_priv(dev); 446 - struct net_device *peer = rtnl_dereference(priv->peer); 447 - u64 peer_ifindex; 448 - 449 - peer_ifindex = peer ? peer->ifindex : 0; 450 - if (nla_put_u64(skb, VETH_INFO_PEER, peer_ifindex)) 451 - return -EMSGSIZE; 452 - 453 - return 0; 454 - } 455 - 456 437 static struct rtnl_link_ops veth_link_ops = { 457 438 .kind = DRV_NAME, 458 439 .priv_size = sizeof(struct veth_priv), ··· 443 462 .dellink = veth_dellink, 444 463 .policy = veth_policy, 445 464 .maxtype = VETH_INFO_MAX, 446 - .get_size = veth_get_size, 447 - .fill_info = veth_fill_info, 448 465 }; 449 466 450 467 /*