From: Grant Grundler <grundler@parisc-linux•org>
To: Stephen Hemminger <shemminger@vyatta•com>
Cc: David Miller <davem@davemloft•net>,
Grant Grundler <grundler@parisc-linux•org>,
Kyle McMartin <kyle@mcmartin•ca>,
netdev@vger•kernel.org
Subject: Re: [PATCH 28/42] dmfe: convert to new API
Date: Thu, 8 Jan 2009 14:16:08 -0700 [thread overview]
Message-ID: <20090108211608.GA20506@colo.lackof.org> (raw)
In-Reply-To: <20090107003348.502777359@vyatta.com>
On Tue, Jan 06, 2009 at 04:33:44PM -0800, Stephen Hemminger wrote:
> Convert to internal net_device-stats and net_device_ops
>
> Signed-off-by: Stephen Hemminger <shemminger@vyatta•com>
Acked-by: Grant Grundler <grundler@parisc-linux•org>
Davem - this one get overlooked?
I didn't see an "applied" email like the others in the series.
thanks,
grant
>
>
> --- a/drivers/net/tulip/dmfe.c 2009-01-06 16:08:31.169364168 -0800
> +++ b/drivers/net/tulip/dmfe.c 2009-01-06 16:13:50.841110201 -0800
> @@ -257,9 +257,6 @@ struct dmfe_board_info {
> u8 wol_mode; /* user WOL settings */
> struct timer_list timer;
>
> - /* System defined statistic counter */
> - struct net_device_stats stats;
> -
> /* Driver defined statistic counter */
> unsigned long tx_fifo_underrun;
> unsigned long tx_loss_carrier;
> @@ -316,7 +313,6 @@ static u8 SF_mode; /* Special Function:
> static int dmfe_open(struct DEVICE *);
> static int dmfe_start_xmit(struct sk_buff *, struct DEVICE *);
> static int dmfe_stop(struct DEVICE *);
> -static struct net_device_stats * dmfe_get_stats(struct DEVICE *);
> static void dmfe_set_filter_mode(struct DEVICE *);
> static const struct ethtool_ops netdev_ethtool_ops;
> static u16 read_srom_word(long ,int);
> @@ -351,6 +347,19 @@ static void dmfe_set_phyxcer(struct dmfe
>
> /* DM910X network board routine ---------------------------- */
>
> +static const struct net_device_ops netdev_ops = {
> + .ndo_open = dmfe_open,
> + .ndo_stop = dmfe_stop,
> + .ndo_start_xmit = dmfe_start_xmit,
> + .ndo_set_multicast_list = dmfe_set_filter_mode,
> + .ndo_change_mtu = eth_change_mtu,
> + .ndo_set_mac_address = eth_mac_addr,
> + .ndo_validate_addr = eth_validate_addr,
> +#ifdef CONFIG_NET_POLL_CONTROLLER
> + .ndo_poll_controller = poll_dmfe,
> +#endif
> +};
> +
> /*
> * Search DM910X board ,allocate space and register it
> */
> @@ -442,14 +451,7 @@ static int __devinit dmfe_init_one (stru
> dev->base_addr = db->ioaddr;
> dev->irq = pdev->irq;
> pci_set_drvdata(pdev, dev);
> - dev->open = &dmfe_open;
> - dev->hard_start_xmit = &dmfe_start_xmit;
> - dev->stop = &dmfe_stop;
> - dev->get_stats = &dmfe_get_stats;
> - dev->set_multicast_list = &dmfe_set_filter_mode;
> -#ifdef CONFIG_NET_POLL_CONTROLLER
> - dev->poll_controller = &poll_dmfe;
> -#endif
> + dev->netdev_ops = &netdev_ops;
> dev->ethtool_ops = &netdev_ethtool_ops;
> netif_carrier_off(dev);
> spin_lock_init(&db->lock);
> @@ -867,15 +869,15 @@ static void dmfe_free_tx_pkt(struct DEVI
>
> /* A packet sent completed */
> db->tx_packet_cnt--;
> - db->stats.tx_packets++;
> + dev->stats.tx_packets++;
>
> /* Transmit statistic counter */
> if ( tdes0 != 0x7fffffff ) {
> /* printk(DRV_NAME ": tdes0=%x\n", tdes0); */
> - db->stats.collisions += (tdes0 >> 3) & 0xf;
> - db->stats.tx_bytes += le32_to_cpu(txptr->tdes1) & 0x7ff;
> + dev->stats.collisions += (tdes0 >> 3) & 0xf;
> + dev->stats.tx_bytes += le32_to_cpu(txptr->tdes1) & 0x7ff;
> if (tdes0 & TDES0_ERR_MASK) {
> - db->stats.tx_errors++;
> + dev->stats.tx_errors++;
>
> if (tdes0 & 0x0002) { /* UnderRun */
> db->tx_fifo_underrun++;
> @@ -969,13 +971,13 @@ static void dmfe_rx_packet(struct DEVICE
> if (rdes0 & 0x8000) {
> /* This is a error packet */
> //printk(DRV_NAME ": rdes0: %lx\n", rdes0);
> - db->stats.rx_errors++;
> + dev->stats.rx_errors++;
> if (rdes0 & 1)
> - db->stats.rx_fifo_errors++;
> + dev->stats.rx_fifo_errors++;
> if (rdes0 & 2)
> - db->stats.rx_crc_errors++;
> + dev->stats.rx_crc_errors++;
> if (rdes0 & 0x80)
> - db->stats.rx_length_errors++;
> + dev->stats.rx_length_errors++;
> }
>
> if ( !(rdes0 & 0x8000) ||
> @@ -1008,8 +1010,8 @@ static void dmfe_rx_packet(struct DEVICE
>
> skb->protocol = eth_type_trans(skb, dev);
> netif_rx(skb);
> - db->stats.rx_packets++;
> - db->stats.rx_bytes += rxlen;
> + dev->stats.rx_packets++;
> + dev->stats.rx_bytes += rxlen;
> }
> } else {
> /* Reuse SKB buffer when the packet is error */
> @@ -1024,20 +1026,6 @@ static void dmfe_rx_packet(struct DEVICE
> db->rx_ready_ptr = rxptr;
> }
>
> -
> -/*
> - * Get statistics from driver.
> - */
> -
> -static struct net_device_stats * dmfe_get_stats(struct DEVICE *dev)
> -{
> - struct dmfe_board_info *db = netdev_priv(dev);
> -
> - DMFE_DBUG(0, "dmfe_get_stats", 0);
> - return &db->stats;
> -}
> -
> -
> /*
> * Set DM910X multicast address
> */
> @@ -1161,7 +1149,7 @@ static void dmfe_timer(unsigned long dat
>
> /* Operating Mode Check */
> if ( (db->dm910x_chk_mode & 0x1) &&
> - (db->stats.rx_packets > MAX_CHECK_PACKET) )
> + (dev->stats.rx_packets > MAX_CHECK_PACKET) )
> db->dm910x_chk_mode = 0x4;
>
> /* Dynamic reset DM910X : system error or transmit time-out */
>
> --
next prev parent reply other threads:[~2009-01-08 21:16 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-07 0:33 [PATCH 00/42] Still more net_device API updates Stephen Hemminger
2009-01-07 0:33 ` [PATCH 01/42] appletalk: convert aarp to net_device_ops Stephen Hemminger
2009-01-08 1:21 ` David Miller
2009-01-08 3:09 ` Joe Perches
2009-01-08 4:39 ` David Miller
2009-01-07 0:33 ` [PATCH 02/42] appletalk: convert ipddp " Stephen Hemminger
2009-01-08 1:22 ` David Miller
2009-01-07 0:33 ` [PATCH 03/42] bluetooth: driver API update Stephen Hemminger
[not found] ` <20090107003345.753201945-ZtmgI6mnKB3QT0dZR+AlfA@public.gmane.org>
2009-01-07 1:53 ` Marcel Holtmann
2009-01-08 1:23 ` David Miller
2009-01-07 0:33 ` [PATCH 05/42] cassini: update to net_device_ops Stephen Hemminger
2009-01-08 1:25 ` David Miller
2009-01-07 0:33 ` [PATCH 06/42] ipg: " Stephen Hemminger
2009-01-07 7:59 ` Pekka Enberg
2009-01-08 1:26 ` David Miller
2009-01-07 0:33 ` [PATCH 07/42] plip: " Stephen Hemminger
2009-01-08 1:26 ` David Miller
2009-01-07 0:33 ` [PATCH 08/42] tlan: " Stephen Hemminger
2009-01-08 1:27 ` David Miller
2009-01-07 0:33 ` [PATCH 09/42] epic100: " Stephen Hemminger
2009-01-08 1:27 ` David Miller
2009-01-07 0:33 ` [PATCH 10/42] sunhme: " Stephen Hemminger
2009-01-08 1:28 ` David Miller
2009-01-07 0:33 ` [PATCH 11/42] sungem: " Stephen Hemminger
2009-01-08 1:29 ` David Miller
2009-01-07 0:33 ` [PATCH 12/42] pcnet32: " Stephen Hemminger
2009-01-08 1:29 ` David Miller
2009-01-07 0:33 ` [PATCH 13/42] typhoon: " Stephen Hemminger
2009-01-08 1:29 ` David Miller
2009-01-07 0:33 ` [PATCH 14/42] enc28j60: " Stephen Hemminger
2009-01-08 1:30 ` David Miller
2009-01-07 0:33 ` [PATCH 16/42] de600: " Stephen Hemminger
2009-01-08 1:35 ` David Miller
2009-01-08 1:48 ` [PATCH 15/42] hp100: " Stephen Hemminger
2009-01-08 2:13 ` David Miller
2009-01-07 0:33 ` [PATCH 17/42] sis190: " Stephen Hemminger
2009-01-08 1:35 ` David Miller
2009-01-07 0:33 ` [PATCH 18/42] ns83820: fix net_device_ops support Stephen Hemminger
2009-01-08 1:36 ` David Miller
2009-01-07 0:33 ` [PATCH 19/42] sb1000: update to net_device_ops Stephen Hemminger
2009-01-08 1:57 ` David Miller
2009-01-07 0:33 ` [PATCH 20/42] natsemi: " Stephen Hemminger
2009-01-08 1:57 ` David Miller
2009-01-07 0:33 ` [PATCH 21/42] fealnx: " Stephen Hemminger
2009-01-08 1:57 ` David Miller
2009-01-07 0:33 ` [PATCH 22/42] starfire: " Stephen Hemminger
2009-01-08 1:58 ` David Miller
2009-01-07 0:33 ` [PATCH 23/42] sundance: " Stephen Hemminger
2009-01-08 1:58 ` David Miller
2009-01-07 0:33 ` [PATCH 24/42] tulip: convert devices to new API Stephen Hemminger
2009-01-07 7:49 ` Grant Grundler
2009-01-08 1:59 ` David Miller
2009-01-07 0:33 ` [PATCH 25/42] de2104x: convert to net_device_ops Stephen Hemminger
2009-01-07 7:50 ` Grant Grundler
2009-01-08 1:59 ` David Miller
2009-01-07 0:33 ` [PATCH 26/42] de4x5: " Stephen Hemminger
2009-01-08 2:00 ` David Miller
2009-01-07 0:33 ` [PATCH 27/42] xircom: convert devices to new API Stephen Hemminger
2009-01-08 2:01 ` David Miller
2009-01-07 0:33 ` [PATCH 28/42] dmfe: convert " Stephen Hemminger
2009-01-08 21:16 ` Grant Grundler [this message]
2009-01-08 21:32 ` David Miller
2009-01-07 0:33 ` [PATCH 29/42] uli526x: convert devices " Stephen Hemminger
2009-01-08 2:01 ` David Miller
2009-01-07 0:33 ` [PATCH 30/42] windbond: " Stephen Hemminger
2009-01-08 2:02 ` David Miller
2009-01-07 0:33 ` [PATCH 31/42] dvb: update network device to current API Stephen Hemminger
2009-01-08 2:02 ` David Miller
2009-01-07 0:33 ` [PATCH 32/42] hysdn: convert to net_device_ops and other updates Stephen Hemminger
2009-01-08 2:03 ` David Miller
2009-01-07 0:33 ` [PATCH 33/42] I4l: convert to net_device_ops Stephen Hemminger
2009-01-07 0:33 ` [PATCH 34/42] fusion: convert devices to new API Stephen Hemminger
2009-01-08 2:04 ` David Miller
2009-01-07 0:33 ` [PATCH 35/42] xpnet: " Stephen Hemminger
2009-01-08 2:05 ` David Miller
2009-01-07 0:33 ` [PATCH 36/42] gadget: " Stephen Hemminger
2009-01-08 2:05 ` David Miller
2009-01-07 0:33 ` [PATCH 37/42] synclink: " Stephen Hemminger
2009-01-07 23:48 ` [PATCH 37/42] synclink: convert devices to new API (rev2) Stephen Hemminger
2009-01-08 2:08 ` David Miller
2009-01-08 22:49 ` Krzysztof Halasa
2009-01-08 22:55 ` Krzysztof Halasa
2009-01-13 0:18 ` David Miller
2009-01-07 0:33 ` [PATCH 38/42] uwb: convert devices to net_device_ops Stephen Hemminger
2009-01-07 10:38 ` David Vrabel
2009-01-08 2:09 ` David Miller
2009-01-07 0:33 ` [PATCH 39/42] slip: convert " Stephen Hemminger
2009-01-08 2:09 ` David Miller
2009-01-07 0:33 ` [PATCH 40/42] amd8111e: " Stephen Hemminger
2009-01-08 2:10 ` David Miller
2009-01-07 0:33 ` [PATCH 41/42] atp: " Stephen Hemminger
2009-01-08 2:10 ` David Miller
2009-01-07 0:33 ` [PATCH 42/42] b44: " Stephen Hemminger
2009-01-08 2:10 ` David Miller
[not found] ` <20090107003345.872219054@vyatta.com>
2009-01-08 1:25 ` [PATCH 04/42] phonet: update " David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090108211608.GA20506@colo.lackof.org \
--to=grundler@parisc-linux$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=kyle@mcmartin$(echo .)ca \
--cc=netdev@vger$(echo .)kernel.org \
--cc=shemminger@vyatta$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox