aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Blaschka <frank.blaschka@de.ibm.com>2009-01-08 22:43:56 -0500
committerDavid S. Miller <davem@davemloft.net>2009-01-21 17:02:41 -0500
commit0e0b46d80f8768c465c14994aba91ee714b0d7b7 (patch)
treed015097916ed3620a47d15f855b1db69476d2d7c
parentba270ede101ad7439de7d4e92b71eece26db5c26 (diff)
lcs: convert to net_device_ops
lcs convert to net_device_ops. Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/s390/net/lcs.c21
1 files changed, 16 insertions, 5 deletions
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index acca6678cb2b..bca08eff4a77 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -2097,6 +2097,20 @@ lcs_register_netdev(struct ccwgroup_device *ccwgdev)
2097/** 2097/**
2098 * lcs_new_device will be called by setting the group device online. 2098 * lcs_new_device will be called by setting the group device online.
2099 */ 2099 */
2100static const struct net_device_ops lcs_netdev_ops = {
2101 .ndo_open = lcs_open_device,
2102 .ndo_stop = lcs_stop_device,
2103 .ndo_get_stats = lcs_getstats,
2104 .ndo_start_xmit = lcs_start_xmit,
2105};
2106
2107static const struct net_device_ops lcs_mc_netdev_ops = {
2108 .ndo_open = lcs_open_device,
2109 .ndo_stop = lcs_stop_device,
2110 .ndo_get_stats = lcs_getstats,
2111 .ndo_start_xmit = lcs_start_xmit,
2112 .ndo_set_multicast_list = lcs_set_multicast_list,
2113};
2100 2114
2101static int 2115static int
2102lcs_new_device(struct ccwgroup_device *ccwgdev) 2116lcs_new_device(struct ccwgroup_device *ccwgdev)
@@ -2164,14 +2178,11 @@ lcs_new_device(struct ccwgroup_device *ccwgdev)
2164 goto out; 2178 goto out;
2165 card->dev = dev; 2179 card->dev = dev;
2166 card->dev->ml_priv = card; 2180 card->dev->ml_priv = card;
2167 card->dev->open = lcs_open_device; 2181 card->dev->netdev_ops = &lcs_netdev_ops;
2168 card->dev->stop = lcs_stop_device;
2169 card->dev->hard_start_xmit = lcs_start_xmit;
2170 card->dev->get_stats = lcs_getstats;
2171 memcpy(card->dev->dev_addr, card->mac, LCS_MAC_LENGTH); 2182 memcpy(card->dev->dev_addr, card->mac, LCS_MAC_LENGTH);
2172#ifdef CONFIG_IP_MULTICAST 2183#ifdef CONFIG_IP_MULTICAST
2173 if (!lcs_check_multicast_support(card)) 2184 if (!lcs_check_multicast_support(card))
2174 card->dev->set_multicast_list = lcs_set_multicast_list; 2185 card->dev->netdev_ops = &lcs_mc_netdev_ops;
2175#endif 2186#endif
2176netdev_out: 2187netdev_out:
2177 lcs_set_allowed_threads(card,0xffffffff); 2188 lcs_set_allowed_threads(card,0xffffffff);