| Message ID | 1533684269-10495-1-git-send-email-kamal@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [Bionic] UBUNTU: SAUCE: fix warning from "ipvlan: drop ipv6 dependency" | expand |
On 08/07/2018 07:24 PM, Kamal Mostafa wrote: > Backport commit eacec4b "ipvlan: drop ipv6 dependency" inadvertently > introduced an unused function ipvlan_is_valid_dev(), which should be > dropped. > > Ignore: yes > > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > --- > drivers/net/ipvlan/ipvlan_main.c | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c > index 0cfbcdf..b858e98 100644 > --- a/drivers/net/ipvlan/ipvlan_main.c > +++ b/drivers/net/ipvlan/ipvlan_main.c > @@ -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) > { Acked-by: Joseph Salisbury <joseph.salisbury@canonical.com>
On 2018-08-07 16:24:29 , Kamal Mostafa wrote: > Backport commit eacec4b "ipvlan: drop ipv6 dependency" inadvertently > introduced an unused function ipvlan_is_valid_dev(), which should be > dropped. > > Ignore: yes > > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > --- > drivers/net/ipvlan/ipvlan_main.c | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c > index 0cfbcdf..b858e98 100644 > --- a/drivers/net/ipvlan/ipvlan_main.c > +++ b/drivers/net/ipvlan/ipvlan_main.c > @@ -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) > { > -- Not sure what to do for the next 49 minutes.... Acked-by: Khalid Elmously <khalid.elmously@canonical.com>
On 08/08/18 01:24, Kamal Mostafa wrote: > Backport commit eacec4b "ipvlan: drop ipv6 dependency" inadvertently > introduced an unused function ipvlan_is_valid_dev(), which should be > dropped. > > Ignore: yes Hi Kamal, Any reason why we don't want this fix on the changelog? thanks, Kleber > > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > --- > drivers/net/ipvlan/ipvlan_main.c | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c > index 0cfbcdf..b858e98 100644 > --- a/drivers/net/ipvlan/ipvlan_main.c > +++ b/drivers/net/ipvlan/ipvlan_main.c > @@ -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) > { >
As discussed in irc, please drop the Ignore, and add a BugLink to the original commit when you apply: BugLink: http://bugs.launchpad.net/bugs/1776927 -Kamal On Tue, Aug 14, 2018 at 5:52 AM Kleber Souza <kleber.souza@canonical.com> wrote: > On 08/08/18 01:24, Kamal Mostafa wrote: > > Backport commit eacec4b "ipvlan: drop ipv6 dependency" inadvertently > > introduced an unused function ipvlan_is_valid_dev(), which should be > > dropped. > > > > Ignore: yes > > Hi Kamal, > > Any reason why we don't want this fix on the changelog? > > > thanks, > Kleber > > > > > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > > --- > > drivers/net/ipvlan/ipvlan_main.c | 13 ------------- > > 1 file changed, 13 deletions(-) > > > > diff --git a/drivers/net/ipvlan/ipvlan_main.c > b/drivers/net/ipvlan/ipvlan_main.c > > index 0cfbcdf..b858e98 100644 > > --- a/drivers/net/ipvlan/ipvlan_main.c > > +++ b/drivers/net/ipvlan/ipvlan_main.c > > @@ -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) > > { > > > > <div dir="ltr">As discussed in irc, please drop the Ignore, and add a BugLink to the original commit when you apply:<div><br></div><div>BugLink: <a href="http://bugs.launchpad.net/bugs/1776927">http://bugs.launchpad.net/bugs/1776927</a><div><br></div></div><div> -Kamal</div></div><br><div class="gmail_quote"><div dir="ltr">On Tue, Aug 14, 2018 at 5:52 AM Kleber Souza <<a href="mailto:kleber.souza@canonical.com">kleber.souza@canonical.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On 08/08/18 01:24, Kamal Mostafa wrote:<br> > Backport commit eacec4b "ipvlan: drop ipv6 dependency" inadvertently<br> > introduced an unused function ipvlan_is_valid_dev(), which should be<br> > dropped.<br> > <br> > Ignore: yes<br> <br> Hi Kamal,<br> <br> Any reason why we don't want this fix on the changelog?<br> <br> <br> thanks,<br> Kleber<br> <br> > <br> > Signed-off-by: Kamal Mostafa <<a href="mailto:kamal@canonical.com" target="_blank">kamal@canonical.com</a>><br> > ---<br> > drivers/net/ipvlan/ipvlan_main.c | 13 -------------<br> > 1 file changed, 13 deletions(-)<br> > <br> > diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c<br> > index 0cfbcdf..b858e98 100644<br> > --- a/drivers/net/ipvlan/ipvlan_main.c<br> > +++ b/drivers/net/ipvlan/ipvlan_main.c<br> > @@ -847,19 +847,6 @@ static void ipvlan_del_addr(struct ipvl_dev *ipvlan, void *iaddr, bool is_v6)<br> > kfree_rcu(addr, rcu);<br> > }<br> > <br> > -static bool ipvlan_is_valid_dev(const struct net_device *dev)<br> > -{<br> > - struct ipvl_dev *ipvlan = netdev_priv(dev);<br> > -<br> > - if (!netif_is_ipvlan(dev))<br> > - return false;<br> > -<br> > - if (!ipvlan || !ipvlan->port)<br> > - return false;<br> > -<br> > - return true;<br> > -}<br> > -<br> > #if IS_ENABLED(CONFIG_IPV6)<br> > static int ipvlan_add_addr6(struct ipvl_dev *ipvlan, struct in6_addr *ip6_addr)<br> > {<br> > <br> <br> </blockquote></div>
On 08/08/18 01:24, Kamal Mostafa wrote: > Backport commit eacec4b "ipvlan: drop ipv6 dependency" inadvertently > introduced an unused function ipvlan_is_valid_dev(), which should be > dropped. > > Ignore: yes Applied to bionic/master-next branch, removing the above line and adding: BugLink: http://bugs.launchpad.net/bugs/1776927 Thanks, Kleber > > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > --- > drivers/net/ipvlan/ipvlan_main.c | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c > index 0cfbcdf..b858e98 100644 > --- a/drivers/net/ipvlan/ipvlan_main.c > +++ b/drivers/net/ipvlan/ipvlan_main.c > @@ -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) > { >
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c index 0cfbcdf..b858e98 100644 --- a/drivers/net/ipvlan/ipvlan_main.c +++ b/drivers/net/ipvlan/ipvlan_main.c @@ -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) {
Backport commit eacec4b "ipvlan: drop ipv6 dependency" inadvertently introduced an unused function ipvlan_is_valid_dev(), which should be dropped. Ignore: yes Signed-off-by: Kamal Mostafa <kamal@canonical.com> --- drivers/net/ipvlan/ipvlan_main.c | 13 ------------- 1 file changed, 13 deletions(-)