]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
UBUNTU: SAUCE: fix warning from "ipvlan: drop ipv6 dependency"
authorKamal Mostafa <kamal@canonical.com>
Tue, 7 Aug 2018 23:24:00 +0000 (01:24 +0200)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 15 Aug 2018 12:45:54 +0000 (14:45 +0200)
BugLink: https://bugs.launchpad.net/bugs/1776927
Backport commit eacec4b "ipvlan: drop ipv6 dependency" inadvertently
introduced an unused function ipvlan_is_valid_dev(), which should be
dropped.

Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Joseph Salisbury <joseph.salisbury@canonical.com>
Acked-by: Khalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/net/ipvlan/ipvlan_main.c

index 0cfbcdfdc89cd1af611f4465088e4cf3e71000d5..b858e98b1dd552fecd5e1838f4c57cc5dcdd3c1c 100644 (file)
@@ -847,19 +847,6 @@ static void ipvlan_del_addr(struct ipvl_dev *ipvlan, void *iaddr, bool is_v6)
        kfree_rcu(addr, rcu);
 }
 
-static bool ipvlan_is_valid_dev(const struct net_device *dev)
-{
-       struct ipvl_dev *ipvlan = netdev_priv(dev);
-
-       if (!netif_is_ipvlan(dev))
-               return false;
-
-       if (!ipvlan || !ipvlan->port)
-               return false;
-
-       return true;
-}
-
 #if IS_ENABLED(CONFIG_IPV6)
 static int ipvlan_add_addr6(struct ipvl_dev *ipvlan, struct in6_addr *ip6_addr)
 {