Linux 3.16 build fix

[GoogleCodeExporter]

hi, the macro SET_ETHTOOL_OPS was eliminated. Obvious patch follows:

diff --git a/sys/dev/netmap/netmap_kern.h b/sys/dev/netmap/netmap_kern.h
index fd84e70..0c140cd 100644
--- a/sys/dev/netmap/netmap_kern.h
+++ b/sys/dev/netmap/netmap_kern.h
@@ -789,7 +789,7 @@ nm_set_native_flags(struct netmap_adapter *na)
        na->if_transmit = (void *)ifp->netdev_ops;
        ifp->netdev_ops = &((struct netmap_hw_adapter *)na)->nm_ndo;
        ((struct netmap_hw_adapter *)na)->save_ethtool = ifp->ethtool_ops;
-       SET_ETHTOOL_OPS(ifp, &((struct netmap_hw_adapter*)na)->nm_eto);
+       ifp->ethtool_ops = &((struct netmap_hw_adapter*)na)->nm_eto;
 #endif
 }

@@ -803,7 +803,7 @@ nm_clear_native_flags(struct netmap_adapter *na)
        ifp->if_transmit = na->if_transmit;
 #else
        ifp->netdev_ops = (void *)na->if_transmit;
-       SET_ETHTOOL_OPS(ifp, ((struct netmap_hw_adapter*)na)->save_ethtool);
+       ifp->ethtool_ops = ((struct netmap_hw_adapter*)na)->save_ethtool;
 #endif
        na->na_flags &= ~(NAF_NATIVE_ON | NAF_NETMAP_ON);
 #ifdef IFCAP_NETMAP /* or FreeBSD ? */

Original issue reported on code.google.com by schuma...@googlemail.com on 28 Sep 2014 at 1:35

• Merged into: Build failed on linux-3.16 due to SET_ETHTOOL_OPS() #18

[GoogleCodeExporter]

Thank for the report and the patch. Note, however, that this is a duplicate of 
issue 18. The same considerations apply: the issue should be already fixed in 
the 'next' branch. Does that work for you?

Original comment by giuseppe.lettieri73 on 28 Sep 2014 at 1:55

• Changed state: Duplicate
• Added labels: ****
• Removed labels: ****