From a6e7b75d9e0b57198e84c2c7e52137ef982a32a2 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 9 Jan 2009 13:01:20 +0000 Subject: [PATCH] --- yaml --- r: 133807 b: refs/heads/master c: c86d87402966dc3f1996d17ef6bc2b676b46bb60 h: refs/heads/master i: 133805: 763d06580c8678ac7125b6806489237ceff3ec80 133803: b28a047c1ce83a4d5a9c039ed9676f8ab79532ba 133799: 77f048c276b19f1643cf000fb7d31da7234191ef 133791: f493a682019dab3336cc95fafe073bb2fbc59644 v: v3 --- [refs] | 2 +- trunk/drivers/net/tokenring/ibmtr.c | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9940746c4f04..9d440b682141 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fd3238e95046b61d518ddacaa767fa09f31b0d0 +refs/heads/master: c86d87402966dc3f1996d17ef6bc2b676b46bb60 diff --git a/trunk/drivers/net/tokenring/ibmtr.c b/trunk/drivers/net/tokenring/ibmtr.c index f195d54ae421..9d896116cf76 100644 --- a/trunk/drivers/net/tokenring/ibmtr.c +++ b/trunk/drivers/net/tokenring/ibmtr.c @@ -815,17 +815,21 @@ static unsigned char __devinit get_sram_size(struct tok_info *adapt_info) /*****************************************************************************/ +static const struct net_device_ops trdev_netdev_ops = { + .ndo_open = tok_open, + .ndo_stop = tok_close, + .ndo_start_xmit = tok_send_packet, + .ndo_set_multicast_list = tok_set_multicast_list, + .ndo_change_mtu = ibmtr_change_mtu, +}; + static int __devinit trdev_init(struct net_device *dev) { struct tok_info *ti = netdev_priv(dev); SET_PAGE(ti->srb_page); ti->open_failure = NO ; - dev->open = tok_open; - dev->stop = tok_close; - dev->hard_start_xmit = tok_send_packet; - dev->set_multicast_list = tok_set_multicast_list; - dev->change_mtu = ibmtr_change_mtu; + dev->netdev_ops = &trdev_netdev_ops; return 0; }