[NET]: Wrap netdevice hardware header creation.

[net-next-2.6.git] / drivers / net / macvlan.c

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index dc74d006e01f0cf67b39dddad2180b0cbfa4272b..a22087ca968d869dd334bca799a84660cccc24a9 100644 (file)
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -170,8 +170,8 @@ static int macvlan_hard_header(struct sk_buff *skb, struct net_device *dev,
        const struct macvlan_dev *vlan = netdev_priv(dev);
        struct net_device *lowerdev = vlan->lowerdev;
 
-       return lowerdev->hard_header(skb, lowerdev, type, daddr,
-                                    saddr ? : dev->dev_addr, len);
+       return dev_hard_header(skb, lowerdev, type, daddr,
+                              saddr ? : dev->dev_addr, len);
 }
 
 static int macvlan_open(struct net_device *dev)
@@ -282,10 +282,6 @@ static u32 macvlan_ethtool_get_rx_csum(struct net_device *dev)
 static const struct ethtool_ops macvlan_ethtool_ops = {
        .get_link               = ethtool_op_get_link,
        .get_rx_csum            = macvlan_ethtool_get_rx_csum,
-       .get_tx_csum            = ethtool_op_get_tx_csum,
-       .get_tso                = ethtool_op_get_tso,
-       .get_ufo                = ethtool_op_get_ufo,
-       .get_sg                 = ethtool_op_get_sg,
        .get_drvinfo            = macvlan_ethtool_get_drvinfo,
 };
 
@@ -376,7 +372,7 @@ static int macvlan_newlink(struct net_device *dev,
        if (!tb[IFLA_LINK])
                return -EINVAL;
 
-       lowerdev = __dev_get_by_index(nla_get_u32(tb[IFLA_LINK]));
+       lowerdev = __dev_get_by_index(dev->nd_net, nla_get_u32(tb[IFLA_LINK]));
        if (lowerdev == NULL)
                return -ENODEV;