diff mbox

backport: fix netdev destructor backport for v4.11.9

Message ID 20170905065039.25808-1-luca@coelho.fi (mailing list archive)
State Accepted
Headers show

Commit Message

Luca Coelho Sept. 5, 2017, 6:50 a.m. UTC 
From: Luca Coelho <luciano.coelho@intel.com>

The patch that changed the netdev destructor code was backported to
v4.11.9, so handle that in the backport.

Change-Id: I21a64c84d1c46771d9436341537d946e5ae64c1b
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
 backport/backport-include/linux/netdevice.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Johannes Berg Sept. 6, 2017, 2:52 p.m. UTC | #1 
On Tue, 2017-09-05 at 09:50 +0300, Luca Coelho wrote:
> From: Luca Coelho <luciano.coelho@intel.com>
> 
> The patch that changed the netdev destructor code was backported to
> v4.11.9, so handle that in the backport.

Applied, since it was so obvious.

> Change-Id: I21a64c84d1c46771d9436341537d946e5ae64c1b

Without that though :)

johannes
--
To unsubscribe from this list: send the line "unsubscribe backports" in
Luca Coelho Sept. 6, 2017, 3:44 p.m. UTC | #2 
On Wed, 2017-09-06 at 16:52 +0200, Johannes Berg wrote:
> On Tue, 2017-09-05 at 09:50 +0300, Luca Coelho wrote:
> > From: Luca Coelho <luciano.coelho@intel.com>
> > 
> > The patch that changed the netdev destructor code was backported to
> > v4.11.9, so handle that in the backport.
> 
> Applied, since it was so obvious.
> 
> > Change-Id: I21a64c84d1c46771d9436341537d946e5ae64c1b
> 
> Without that though :)

Oops, sorry! I learned to systematically remove those from kernel
patches, but for some reason I left it in this patch.

--
Luca.
--
To unsubscribe from this list: send the line "unsubscribe backports" in
diff mbox

Patch

diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h
index d22eec2d3113..112bcf2b1c15 100644
--- a/backport/backport-include/linux/netdevice.h
+++ b/backport/backport-include/linux/netdevice.h
@@ -320,7 +320,8 @@  static inline void netif_trans_update(struct net_device *dev)
 }
 #endif
 
-#if LINUX_VERSION_IS_LESS(4,12,0)
+#if LINUX_VERSION_IS_LESS(4,12,0) &&		\
+	!LINUX_VERSION_IN_RANGE(4,11,9, 4,12,0)
 #define netdev_set_priv_destructor(_dev, _destructor) \
 	(_dev)->destructor = __ ## _destructor
 #define netdev_set_def_destructor(_dev) \