netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Olaf Hering <olh@suse.de>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: netdev@oss.sgi.com
Subject: Re: netdev-2.6 queue updated
Date: Wed, 20 Oct 2004 19:48:53 +0200	[thread overview]
Message-ID: <20041020174853.GA11659@suse.de> (raw)
In-Reply-To: <20041016010036.GA32213@havoc.gtf.org>

 On Fri, Oct 15, Jeff Garzik wrote:

>  drivers/net/typhoon.c                         |  232 +++----

> Jeff Garzik:
>   o Hand-merge typhoon conflicts
>   o [netdrvr eepro100] fix pci_iomap() args and info msg that follows
>   o [netdrvr b44] update MODULE_AUTHORS
>   o [netdrvr 8139cp] TSO support
>   o [netdev] Remove no-op in-driver implementations of ->set_config()

Current Linus tree does not compile.


diff -purN linux-2.6.9-bk4.orig/drivers/net/typhoon.c linux-2.6.9-bk4/drivers/net/typhoon.c
--- linux-2.6.9-bk4.orig/drivers/net/typhoon.c	2004-10-20 13:57:29.000000000 +0200
+++ linux-2.6.9-bk4/drivers/net/typhoon.c	2004-10-20 14:32:17.000000000 +0200
@@ -2476,7 +2476,7 @@ typhoon_init_one(struct pci_dev *pdev, c
 	dev->set_mac_address	= typhoon_set_mac_address;
 	dev->vlan_rx_register	= typhoon_vlan_rx_register;
 	dev->vlan_rx_kill_vid	= typhoon_vlan_rx_kill_vid;
-	SET_ETHTOOL_OPS(dev, &ops);
+	SET_ETHTOOL_OPS(dev, &typhoon_ethtool_ops);
 
 	/* We can handle scatter gather, up to 16 entries, and
 	 * we can do IP checksumming (only version 4, doh...)

-- 
USB is for mice, FireWire is for men!

sUse lINUX ag, nÜRNBERG

  reply	other threads:[~2004-10-20 17:48 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-10-16  1:00 netdev-2.6 queue updated Jeff Garzik
2004-10-20 17:48 ` Olaf Hering [this message]
2004-10-20 22:33   ` Jeff Garzik
  -- strict thread matches above, loose matches on Subject: below --
2005-08-24  6:57 Jeff Garzik
2005-03-23  3:32 Jeff Garzik
2005-03-23  7:55 ` bert hubert
2005-03-23  8:57   ` Jeff Garzik
2005-03-10  5:37 Jeff Garzik
2005-03-03  7:31 Jeff Garzik
2005-03-03 20:20 ` Daniel Drake
2005-03-04  5:11   ` Jeff Garzik
2005-02-13 20:38 Jeff Garzik
2005-01-28  0:00 Jeff Garzik
2005-01-28  2:15 ` Andy Isaacson
2005-01-28  2:31   ` Jeff Garzik
2005-01-07 11:34 Jeff Garzik
2005-01-07 19:04 ` Francois Romieu
2005-01-07 19:11   ` Jeff Garzik
2004-11-05 10:02 Jeff Garzik
2004-10-01  4:59 Jeff Garzik
2004-09-20 19:48 Jeff Garzik
2004-09-20 20:14 ` Arkadiusz Miskiewicz
2004-09-20 20:31   ` Jeff Garzik
2004-09-20 20:38     ` Arkadiusz Miskiewicz
2004-08-29  1:00 Jeff Garzik
2004-07-27 19:05 Jeff Garzik

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=20041020174853.GA11659@suse.de \
    --to=olh@suse.de \
    --cc=jgarzik@pobox.com \
    --cc=netdev@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).