Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-microblaze.git] / drivers / net / macvlan.c

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index d2d6f12..13b7e0b 100644 (file)
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -179,20 +179,20 @@ static void macvlan_hash_change_addr(struct macvlan_dev *vlan,
        macvlan_hash_add(vlan);
 }
 
-static int macvlan_addr_busy(const struct macvlan_port *port,
-                               const unsigned char *addr)
+static bool macvlan_addr_busy(const struct macvlan_port *port,
+                             const unsigned char *addr)
 {
        /* Test to see if the specified multicast address is
         * currently in use by the underlying device or
         * another macvlan.
         */
        if (ether_addr_equal_64bits(port->dev->dev_addr, addr))
-               return 1;
+               return true;
 
        if (macvlan_hash_lookup(port, addr))
-               return 1;
+               return true;
 
-       return 0;
+       return false;
 }
 
 
@@ -777,7 +777,7 @@ static int macvlan_change_mtu(struct net_device *dev, int new_mtu)
 {
        struct macvlan_dev *vlan = netdev_priv(dev);
 
-       if (new_mtu < 68 || vlan->lowerdev->mtu < new_mtu)
+       if (vlan->lowerdev->mtu < new_mtu)
                return -EINVAL;
        dev->mtu = new_mtu;
        return 0;
@@ -1085,6 +1085,8 @@ void macvlan_common_setup(struct net_device *dev)
 {
        ether_setup(dev);
 
+       dev->min_mtu            = 0;
+       dev->max_mtu            = ETH_MAX_MTU;
        dev->priv_flags        &= ~IFF_TX_SKB_SHARING;
        netif_keep_dst(dev);
        dev->priv_flags        |= IFF_UNICAST_FLT;
@@ -1298,6 +1300,10 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
        else if (dev->mtu > lowerdev->mtu)
                return -EINVAL;
 
+       /* MTU range: 68 - lowerdev->max_mtu */
+       dev->min_mtu = ETH_MIN_MTU;
+       dev->max_mtu = lowerdev->max_mtu;
+
        if (!tb[IFLA_ADDRESS])
                eth_hw_addr_random(dev);