Jeff Kirsher | 1 Oct 2010 01:00
Picon
Favicon

Re: [net-next-2.6 PATCH 2/3] e1000e: reset PHY after errors detected on 82574 Si

On Thu, Sep 30, 2010 at 00:39, Jeff Kirsher <jeffrey.t.kirsher <at> intel.com> wrote:
> From: Carolyn Wyborny <carolyn.wyborny <at> intel.com>
>
> Some errors can be induced in the PHY via environmental testing
> (specifically extreme temperature changes and electro static
> discharge testing), and in the case of the PHY hanging due to
> this input, this detects the problem and resets to continue.
> This issue only applies to 82574 silicon.
>
> Signed-off-by: Jesse Brandeburg <jesse.brandeburg <at> intel.com>
> Signed-off-by: Carolyn Wyborny <carolyn.wyborny <at> intel.com>
> Tested-by: Jeff Pieper <jeffrey.e.pieper <at> intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher <at> intel.com>
> ---
>
>  drivers/net/e1000e/82571.c  |   40 +++++++++++++++++++++++++++++++++++++++-
>  drivers/net/e1000e/e1000.h  |    3 +++
>  drivers/net/e1000e/netdev.c |   25 +++++++++++++++++++++++++
>  3 files changed, 67 insertions(+), 1 deletions(-)
>

Dave - please ignore this patch.  An issue was found with this patch.

--

-- 
Cheers,
Jeff
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo <at> vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
(Continue reading)

Vasanthy Kolluri | 1 Oct 2010 01:34
Picon
Favicon

[net-next-2.6 PATCH 0/3] enic: updates to version 1.4.1.2a

The following patch series implements enic driver updates:

1/3 - Remove dead code
2/3 - Make local functions static
3/3 - Update MAINTAINERS

Signed-off-by: Stephen Hemminger <shemminger <at> vyatta.com>
Signed-off-by: Vasanthy Kolluri <vkolluri <at> cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu <at> cisco.com>
Signed-off-by: David Wang <dwang2 <at> cisco.com>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo <at> vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Vasanthy Kolluri | 1 Oct 2010 01:35
Picon
Favicon

[net-next-2.6 PATCH 1/3] enic: Remove dead code

From: Vasanthy Kolluri <vkolluri <at> cisco.com>

Removed code that is unused

Signed-off-by: Stephen Hemminger <shemminger <at> vyatta.com>
Signed-off-by: Vasanthy Kolluri <vkolluri <at> cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu <at> cisco.com>
Signed-off-by: David Wang <dwang2 <at> cisco.com>
---
 drivers/net/enic/enic.h      |    3 -
 drivers/net/enic/enic_res.c  |   17 -------
 drivers/net/enic/enic_res.h  |    2 -
 drivers/net/enic/vnic_dev.c  |  104 ------------------------------------------
 drivers/net/enic/vnic_dev.h  |   12 -----
 drivers/net/enic/vnic_intr.c |    5 --
 drivers/net/enic/vnic_rss.h  |   45 ------------------
 7 files changed, 1 insertions(+), 187 deletions(-)
 delete mode 100644 drivers/net/enic/vnic_rss.h

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 75869ed..ae62320 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
 <at>  <at>  -28,11 +28,10  <at>  <at> 
 #include "vnic_intr.h"
 #include "vnic_stats.h"
 #include "vnic_nic.h"
-#include "vnic_rss.h"

 #define DRV_NAME		"enic"
(Continue reading)

Vasanthy Kolluri | 1 Oct 2010 01:35
Picon
Favicon

[net-next-2.6 PATCH 2/3] enic: Make local functions static

From: Vasanthy Kolluri <vkolluri <at> cisco.com>

Make functions used locally in a file as static

Signed-off-by: Stephen Hemminger <shemminger <at> vyatta.com>
Signed-off-by: Vasanthy Kolluri <vkolluri <at> cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu <at> cisco.com>
Signed-off-by: David Wang <dwang2 <at> cisco.com>
---
 drivers/net/enic/enic_main.c |    6 +++---
 drivers/net/enic/vnic_dev.c  |   10 +++++-----
 drivers/net/enic/vnic_dev.h  |    7 -------
 drivers/net/enic/vnic_rq.c   |    2 +-
 drivers/net/enic/vnic_rq.h   |    4 ----
 drivers/net/enic/vnic_wq.c   |    2 +-
 drivers/net/enic/vnic_wq.h   |    4 ----
 7 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 711077a..a1f92f1 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
 <at>  <at>  -1972,7 +1972,7  <at>  <at>  static int enic_dev_hang_notify(struct enic *enic)
 	return err;
 }

-int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic)
+static int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic)
 {
 	int err;
(Continue reading)

Vasanthy Kolluri | 1 Oct 2010 01:36
Picon
Favicon

[net-next-2.6 PATCH 3/3] enic: Update MAINTAINERS

From: Vasanthy Kolluri <vkolluri <at> cisco.com>

Update MAINTAINERS list

Signed-off-by: Vasanthy Kolluri <vkolluri <at> cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu <at> cisco.com>
Signed-off-by: David Wang <dwang2 <at> cisco.com>
---
 MAINTAINERS |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 3168d0c..9ddb5ac 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
 <at>  <at>  -1567,9 +1567,9  <at>  <at>  S:	Supported
 F:	scripts/checkpatch.pl

 CISCO VIC ETHERNET NIC DRIVER
-M:	Scott Feldman <scofeldm <at> cisco.com>
 M:	Vasanthy Kolluri <vkolluri <at> cisco.com>
 M:	Roopa Prabhu <roprabhu <at> cisco.com>
+M:	David Wang <dwang2 <at> cisco.com>
 S:	Supported
 F:	drivers/net/enic/
 

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo <at> vger.kernel.org
(Continue reading)

Sami Farin | 1 Oct 2010 01:39
Picon

Re: [E1000-devel] Something wrong with tx/rx/sg/gso with dhclient etc (Was: Linux 2.6.35.6/e1000e does not receive replies from DHCP server, 2.6.33 works)

On Thu, Sep 30, 2010 at 12:44:17 +0300, Sami Farin wrote:
> On Wed, Sep 29, 2010 at 17:40:08 -0600, Tantilov, Emil S wrote:
> > Sami Farin wrote:
> > > False alarm, 2.6.35.6+latest git e1000e does not work any better.
> > > I was just lucky.
> > 
> > Is your `latest git` from Linus or net-next tree? 
> 
> Linus.
> 
> >All of our latest patches go into net-next, so if you haven't already - give it a try and see if it resolves
your issue.
> 
> Maybe later =)

I now tried net-next 6d0722a2cec2c23db3b0855ff8bb433175a16b44, it works fine,
with ethtool -K tx/rx on and off.
I used the same .config as with 2.6.35.6 (make oldconfig).
I retested 2.6.33.7, it's still okay.

And unfortunately 2.6.35.6 did not work very well after rebooting,
I had to waste a lot of time playing with -K tx off rx off, -K tx on rx on, etc.
Before it started working, eth0 had interrupts occurring only on CPU0.
CPU1 started getting some usage only after dhclient started working..
Probably irrelevant, but I am running out of ideas.
I have tried e1000e param IntMode 0, 1, 2, no luck.

--

-- 
Do what you love because life is too short for anything else.

(Continue reading)

David Miller | 1 Oct 2010 01:57
Favicon

Re: [net-next-2.6 PATCH 2/3] e1000e: reset PHY after errors detected on 82574 Si

From: Jeff Kirsher <jeffrey.t.kirsher <at> intel.com>
Date: Thu, 30 Sep 2010 16:00:47 -0700

> Dave - please ignore this patch.  An issue was found with this patch.

Ok.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo <at> vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

David Miller | 1 Oct 2010 02:23
Favicon

Re: [PATCH 1/2] net-next-2.6: SYN retransmits: Rename threshold variable


Damian please don't do things like this.

When we make a change in net-2.6, that change is going to propagate into
net-next-2.6 the next time I do a merge.

And in this case here, the addition of the "syn_set" boolean argument to
retransmits_timed_out() will happen at that point.

So if anything, you should build on top of the bug fix we put into
net-2.6 instead of duplicating the change.

Adding the same change in two different ways to net-2.6 and net-next-2.6
makes the merge a pain in the neck for me and just makes things look
real confusing.

I'm not applying these two patches, please ask me to merge net-2.6 into
net-next-2.6 and this way you can code them relative to that.

Thanks!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo <at> vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

David L Stevens | 1 Oct 2010 02:29
Picon
Favicon

[PATCH] correct IGMP behavior on v3 query during v2-compatibility mode

A recent patch to allow IGMPv2 responses to IGMPv3 queries
bypasses length checks for valid query lengths, incorrectly
resets the v2_seen timer, and does not support IGMPv1.

The following patch responds with a v2 report as required
by IGMPv2 while correcting the other problems introduced
by the patch.

Signed-Off-By: David L Stevens <dlstevens <at> us.ibm.com>

--- linux-2.6.36-rc5/net/ipv4/igmp.c	2010-09-20 16:56:53.000000000 -0700
+++ linux-2.6.36-rc5-dls/net/ipv4/igmp.c	2010-09-28 12:09:03.000000000 -0700
 <at>  <at>  -834,7 +834,7  <at>  <at>  static void igmp_heard_query(struct in_d
 	int			mark = 0;

 
-	if (len == 8 || IGMP_V2_SEEN(in_dev)) {
+	if (len == 8) {
 		if (ih->code == 0) {
 			/* Alas, old v1 router presents here. */

 <at>  <at>  -856,6 +856,18  <at>  <at>  static void igmp_heard_query(struct in_d
 		igmpv3_clear_delrec(in_dev);
 	} else if (len < 12) {
 		return;	/* ignore bogus packet; freed by caller */
+	} else if (IGMP_V1_SEEN(in_dev)) {
+		/* This is a v3 query with v1 queriers present */
+		max_delay = IGMP_Query_Response_Interval;
+		group = 0;
+	} else if (IGMP_V2_SEEN(in_dev)) {
(Continue reading)

Tilman Schmidt | 1 Oct 2010 01:34

[PATCH 2/9] isdn/gigaset: fix bas_gigaset AT read error handling

Rework the handling of USB errors in AT response reads
to fix a possible infinite retry loop and a memory leak,
and silence a few overly verbose kernel messages.

Signed-off-by: Tilman Schmidt <tilman <at> imap.cc>
CC: stable <stable <at> kernel.org>
---
 drivers/isdn/gigaset/bas-gigaset.c |   83 ++++++++++++++---------------------
 1 files changed, 33 insertions(+), 50 deletions(-)

diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index e143050..131976d 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
 <at>  <at>  -438,23 +438,27  <at>  <at>  static void cmd_in_timeout(unsigned long data)
 		return;
 	}

-	if (ucs->retry_cmd_in++ < BAS_RETRY) {
-		dev_notice(cs->dev, "control read: timeout, retry %d\n",
-			   ucs->retry_cmd_in);
-		rc = atread_submit(cs, BAS_TIMEOUT);
-		if (rc >= 0 || rc == -ENODEV)
-			/* resubmitted or disconnected */
-			/* - bypass regular exit block */
-			return;
-	} else {
+	if (ucs->retry_cmd_in++ >= BAS_RETRY) {
 		dev_err(cs->dev,
 			"control read: timeout, giving up after %d tries\n",
(Continue reading)


Gmane