Skip to content

Commit 145186a

Browse files
Stephen Hemmingerdavem330
authored andcommitted
fddi: convert to new network device ops
Similar to ethernet. Convert infrastructure and the one lone FDDI driver (for the one lone user of that hardware??). Compile tested only. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 007c383 commit 145186a

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

drivers/net/skfp/skfddi.c

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,17 @@ static int num_boards; /* total number of adapters configured */
168168
#define PRINTK(s, args...)
169169
#endif // DRIVERDEBUG
170170

171+
static const struct net_device_ops skfp_netdev_ops = {
172+
.ndo_open = skfp_open,
173+
.ndo_stop = skfp_close,
174+
.ndo_start_xmit = skfp_send_pkt,
175+
.ndo_get_stats = skfp_ctl_get_stats,
176+
.ndo_change_mtu = fddi_change_mtu,
177+
.ndo_set_multicast_list = skfp_ctl_set_multicast_list,
178+
.ndo_set_mac_address = skfp_ctl_set_mac_address,
179+
.ndo_do_ioctl = skfp_ioctl,
180+
};
181+
171182
/*
172183
* =================
173184
* = skfp_init_one =
@@ -253,13 +264,7 @@ static int skfp_init_one(struct pci_dev *pdev,
253264
}
254265

255266
dev->irq = pdev->irq;
256-
dev->get_stats = &skfp_ctl_get_stats;
257-
dev->open = &skfp_open;
258-
dev->stop = &skfp_close;
259-
dev->hard_start_xmit = &skfp_send_pkt;
260-
dev->set_multicast_list = &skfp_ctl_set_multicast_list;
261-
dev->set_mac_address = &skfp_ctl_set_mac_address;
262-
dev->do_ioctl = &skfp_ioctl;
267+
dev->netdev_ops = &skfp_netdev_ops;
263268

264269
SET_NETDEV_DEV(dev, &pdev->dev);
265270

include/linux/fddidevice.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#ifdef __KERNEL__
2828
extern __be16 fddi_type_trans(struct sk_buff *skb,
2929
struct net_device *dev);
30+
extern int fddi_change_mtu(struct net_device *dev, int new_mtu);
3031
extern struct net_device *alloc_fddidev(int sizeof_priv);
3132
#endif
3233

net/802/fddi.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,23 +167,27 @@ __be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev)
167167

168168
EXPORT_SYMBOL(fddi_type_trans);
169169

170-
static int fddi_change_mtu(struct net_device *dev, int new_mtu)
170+
int fddi_change_mtu(struct net_device *dev, int new_mtu)
171171
{
172172
if ((new_mtu < FDDI_K_SNAP_HLEN) || (new_mtu > FDDI_K_SNAP_DLEN))
173173
return(-EINVAL);
174174
dev->mtu = new_mtu;
175175
return(0);
176176
}
177+
EXPORT_SYMBOL(fddi_change_mtu);
177178

178179
static const struct header_ops fddi_header_ops = {
179180
.create = fddi_header,
180181
.rebuild = fddi_rebuild_header,
181182
};
182183

184+
183185
static void fddi_setup(struct net_device *dev)
184186
{
185-
dev->change_mtu = fddi_change_mtu;
186187
dev->header_ops = &fddi_header_ops;
188+
#ifdef CONFIG_COMPAT_NET_DEV_OPS
189+
dev->change_mtu = fddi_change_mtu,
190+
#endif
187191

188192
dev->type = ARPHRD_FDDI;
189193
dev->hard_header_len = FDDI_K_SNAP_HLEN+3; /* Assume 802.2 SNAP hdr len + 3 pad bytes */

0 commit comments

Comments
 (0)