[svn-commits] sruffell: branch linux/2.2 r6937 - in /linux/branches/2.2: ./ drivers/dahdi/w...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Aug  4 11:38:56 2009
New Revision: 6937

URL: http://svn.asterisk.org/svn-view/dahdi?view=rev&rev=6937
Log:
Merged revisions 6717,6760 via svnmerge from 
https://origsvn.digium.com/svn/dahdi/linux/trunk

........
  r6717 | sruffell | 2009-06-24 21:30:19 -0500 (Wed, 24 Jun 2009) | 3 lines
  
  wctc4xxp: Update to use struct net_device_ops.
  
  Accomodates a change in the linux kernel network device interface.
........
  r6760 | sruffell | 2009-06-25 17:16:34 -0500 (Thu, 25 Jun 2009) | 1 line
  
  wctc4xxp: Make the wctc4xxp_netdev_ops structure static.
........

Modified:
    linux/branches/2.2/   (props changed)
    linux/branches/2.2/drivers/dahdi/wctc4xxp/base.c

Propchange: linux/branches/2.2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug  4 11:38:56 2009
@@ -1,1 +1,1 @@
-/linux/trunk:1-6696,6712-6713,6715-6716,6718-6759,6761-6767,6769-6770,6772-6779,6781-6784,6786-6790,6792-6793,6795-6796,6798-6803,6844-6863,6933
+/linux/trunk:1-6696,6712-6713,6715-6767,6769-6770,6772-6779,6781-6784,6786-6790,6792-6793,6795-6796,6798-6803,6844-6863,6933

Modified: linux/branches/2.2/drivers/dahdi/wctc4xxp/base.c
URL: http://svn.asterisk.org/svn-view/dahdi/linux/branches/2.2/drivers/dahdi/wctc4xxp/base.c?view=diff&rev=6937&r1=6936&r2=6937
==============================================================================
--- linux/branches/2.2/drivers/dahdi/wctc4xxp/base.c (original)
+++ linux/branches/2.2/drivers/dahdi/wctc4xxp/base.c Tue Aug  4 11:38:56 2009
@@ -742,6 +742,17 @@
 	return 0;
 }
 
+#ifdef HAVE_NET_DEVICE_OPS
+static const struct net_device_ops wctc4xxp_netdev_ops = {
+	.ndo_set_multicast_list = &wctc4xxp_net_set_multi,
+	.ndo_open = &wctc4xxp_net_up,
+	.ndo_stop = &wctc4xxp_net_down,
+	.ndo_start_xmit = &wctc4xxp_net_hard_start_xmit,
+	.ndo_get_stats = &wctc4xxp_net_get_stats,
+	.ndo_do_ioctl = &wctc4xxp_net_ioctl,
+};
+#endif
+
 /**
  * wctc4xxp_net_register - Register a new network interface.
  * @wc: transcoder card to register the interface for.
@@ -773,14 +784,21 @@
 	netdev->priv = wc;
 #	endif
 	memcpy(netdev->dev_addr, our_mac, sizeof(our_mac));
+
+#	ifdef HAVE_NET_DEVICE_OPS
+	netdev->netdev_ops = &wctc4xxp_netdev_ops;
+#	else
 	netdev->set_multicast_list = &wctc4xxp_net_set_multi;
 	netdev->open = &wctc4xxp_net_up;
 	netdev->stop = &wctc4xxp_net_down;
 	netdev->hard_start_xmit = &wctc4xxp_net_hard_start_xmit;
 	netdev->get_stats = &wctc4xxp_net_get_stats;
 	netdev->do_ioctl = &wctc4xxp_net_ioctl;
+#	endif
+
 	netdev->promiscuity = 0;
 	netdev->flags |= IFF_NOARP;
+
 #	if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
 	netdev->poll = &wctc4xxp_poll;
 	netdev->weight = 64;