]> rtime.felk.cvut.cz Git - socketcan-devel.git/commitdiff
SJA1000: add missing netdev_ops support for > 2.6.29
authorwolf <wolf@030b6a49-0b11-0410-94ab-b0dab22257f2>
Tue, 17 Feb 2009 11:27:17 +0000 (11:27 +0000)
committerwolf <wolf@030b6a49-0b11-0410-94ab-b0dab22257f2>
Tue, 17 Feb 2009 11:27:17 +0000 (11:27 +0000)
We need that for kernel inclusion as well, puh!

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
git-svn-id: svn://svn.berlios.de//socketcan/trunk@954 030b6a49-0b11-0410-94ab-b0dab22257f2

kernel/2.6/drivers/net/can/sja1000/sja1000.c

index dfa48ece036b7e8e527b5bc561708ce1092a4d46..f9244ca3068e450b3752e8908cf3210d337f6491 100644 (file)
@@ -653,6 +653,14 @@ void free_sja1000dev(struct net_device *dev)
 }
 EXPORT_SYMBOL_GPL(free_sja1000dev);
 
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)
+static const struct net_device_ops sja1000_netdev_ops = {
+       .ndo_open               = sja1000_open,
+       .ndo_stop               = sja1000_close,
+       .ndo_start_xmit         = sja1000_start_xmit,
+};
+#endif
+
 int register_sja1000dev(struct net_device *dev)
 {
        struct sja1000_priv *priv = netdev_priv(dev);
@@ -663,10 +671,13 @@ int register_sja1000dev(struct net_device *dev)
 
        dev->flags |= IFF_ECHO; /* we support local echo */
 
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)
+       dev->netdev_ops = &sja1000_netdev_ops;
+#else
        dev->open = sja1000_open;
        dev->stop = sja1000_close;
-
        dev->hard_start_xmit = sja1000_start_xmit;
+#endif
 
        priv->can.bittiming_const = &sja1000_bittiming_const;
        priv->can.do_set_bittiming = sja1000_set_bittiming;