* bnx2 cards intermittantly going offline
From: Mills, Tony @ 2011-01-18 10:54 UTC (permalink / raw)
To: netdev@vger.kernel.org
Hi,
I was running Debian lenny 64bit with a 2.6.24 kernel which seemed to have a rather old version of the bnx2 driver, I have been getting reports that there have been issues with connectivity, this seems to happen randomly across many different servers in different data centres.
Further investigation showed that the interfaces become completely unresponsive for periods of time, whereby machines are unable to ping the host with the problem and the server with the problem is unable to ping out, our tcp application which is time critical will kick off connections.
The network cards are Broadcom NetXtreme II BCM5708 Gigabit Ethernet cards on Dell 2950's plugged into Cisco 3750E's.
Reading various posts indicated that I might be experiencing a problem that may have already been solved so attempted to build the drivers from the Broadcom website into the 2.4.24 kernel without success, eventually compiling against a 2.3.32 kernel worked great.
I have installed this on 4 machines in different data centres and followed some of the other posts I have found, in an attempt to fix the issues, however none of the things i have tried appear to be affective :-
1. Was seeing rx_fw_discards so upped rx ring buffer to both 1020 and 4080, this stopped the rx_fw_discards but not the "unresponsiveness".
2. Have enabled flow control on one of the machines, this still has the unresponsive behaviour and the port on the switch shows 0 pause frames received.
3. Upgraded the kernel and driver to latest available.
Last night i setup a machine to monitor overnight and at 3:52 this morning it became unresponsive.
The switch was setup to "flowcontrol desired", and the machine had the following settings:-
ethtool -g eth0
Ring parameters for eth0:
Pre-set maximums:
RX: 4080
RX Mini: 0
RX Jumbo: 16320
TX: 255
Current hardware settings:
RX: 4080
RX Mini: 0
RX Jumbo: 0
TX: 255
ethtool -a eth0
Pause parameters for eth0:
Autonegotiate: on
RX: on
TX: on
The output from ethtool -S eth0
NIC statistics:
rx_bytes: 65832403312
rx_error_bytes: 0
tx_bytes: 141615699363
tx_error_bytes: 0
rx_ucast_packets: 565468011
rx_mcast_packets: 3
rx_bcast_packets: 193008
tx_ucast_packets: 768277404
tx_mcast_packets: 8
tx_bcast_packets: 657
tx_mac_errors: 0
tx_carrier_errors: 0
rx_crc_errors: 0
rx_align_errors: 0
tx_single_collisions: 0
tx_multi_collisions: 0
tx_deferred: 0
tx_excess_collisions: 0
tx_late_collisions: 0
tx_total_collisions: 0
rx_fragments: 0
rx_jabbers: 0
rx_undersize_packets: 0
rx_oversize_packets: 0
rx_64_byte_packets: 398958533
rx_65_to_127_byte_packets: 125222178
rx_128_to_255_byte_packets: 16962519
rx_256_to_511_byte_packets: 6100929
rx_512_to_1023_byte_packets: 2314593
rx_1024_to_1522_byte_packets: 16102270
rx_1523_to_9022_byte_packets: 0
tx_64_byte_packets: 331974057
tx_65_to_127_byte_packets: 239480821
tx_128_to_255_byte_packets: 78102231
tx_256_to_511_byte_packets: 33163946
tx_512_to_1023_byte_packets: 57321357
tx_1024_to_1522_byte_packets: 28235657
tx_1523_to_9022_byte_packets: 0
rx_xon_frames: 0
rx_xoff_frames: 0
tx_xon_frames: 0
tx_xoff_frames: 0
rx_mac_ctrl_frames: 0
rx_filtered_packets: 43417
rx_ftq_discards: 0
rx_discards: 0
rx_fw_discards: 0
The switch port showed no pause frames
show interfaces gigabitEthernet X/X/X flowcontrol
Port Send FlowControl Receive FlowControl RxPause TxPause
admin oper admin oper
--------- -------- -------- -------- -------- ------- -------
GiX/X/X Unsupp. Unsupp. desired on 0 0
(The switch is unable to send flow control packets but can receive).
Would someone be able to point me at anything else that may help identify/fix the issue.
Best Regards
Tony Mills
--
IMPORTANT NOTICE
The sender does not guarantee that this message, including any attachment, is secure
or virus free. Also, it is confidential and may be privileged or otherwise protected
from disclosure. If you are not the intended recipient, do not disclose or copy it
or its contents. Please telephone or email the sender and delete the message
entirely from your system.
Jagex Limited is a company registered in England & Wales with company number
03982706 and a registered office at St John's Innovation Centre, Cowley Road,
Cambridge, CB4 0WS, UK.
^ permalink raw reply
* [PATCH] vhost: rcu annotation fixup
From: Michael S. Tsirkin @ 2011-01-18 11:08 UTC (permalink / raw)
To: Jason Wang, kvm, virtualization, netdev, linux-kernel
When built with rcu checks enabled, vhost triggers
bogus warnings as vhost features are read without
dev->mutex sometimes.
Fixing it properly is not trivial as vhost.h does not
know which lockdep classes it will be used under.
Disable the warning by stubbing out the check for now.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/vhost/vhost.h | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h
index 2af44b7..2d03a31 100644
--- a/drivers/vhost/vhost.h
+++ b/drivers/vhost/vhost.h
@@ -173,9 +173,7 @@ static inline int vhost_has_feature(struct vhost_dev *dev, int bit)
{
unsigned acked_features;
- acked_features =
- rcu_dereference_index_check(dev->acked_features,
- lockdep_is_held(&dev->mutex));
+ acked_features = rcu_dereference_index_check(dev->acked_features, 1);
return acked_features & (1 << bit);
}
--
1.7.3.2.91.g446ac
^ permalink raw reply related
* [PATCH] gianfar: Fix misleading indentation in startup_gfar()
From: Anton Vorontsov @ 2011-01-18 12:36 UTC (permalink / raw)
To: David Miller; +Cc: netdev
Just stumbled upon the issue while looking for another bug.
The code looks correct, the indentation is not.
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
---
drivers/net/gianfar.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 119aa20..5ed8f9f 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -1920,7 +1920,7 @@ int startup_gfar(struct net_device *ndev)
if (err) {
for (j = 0; j < i; j++)
free_grp_irqs(&priv->gfargrp[j]);
- goto irq_fail;
+ goto irq_fail;
}
}
--
1.7.0.5
^ permalink raw reply related
* Re: [PATCH] bonding: added 802.3ad round-robin hashing policy for single TCP session balancing
From: Oleg V. Ukhno @ 2011-01-18 12:40 UTC (permalink / raw)
To: John Fastabend; +Cc: Jay Vosburgh, netdev@vger.kernel.org, David S. Miller
In-Reply-To: <4D35060D.5080004@intel.com>
On 01/18/2011 06:16 AM, John Fastabend wrote:
> On 1/14/2011 4:05 PM, Jay Vosburgh wrote:
>> Can somebody (John?) more knowledgable than I about dm-multipath
>> comment on the above?
>
> Here I'll give it a go.
>
> I don't think detecting L2 link failure this way is very robust. If there
> is a failure farther away then your immediate link your going to break
> completely? Your bonding hash will continue to round robin the iscsi
> packets and half them will get dropped on the floor. dm-multipath handles
> this reasonably gracefully. Also in this bonding environment you seem to
> be very sensitive to RTT times on the network. Maybe not bad out right but
> I wouldn't consider this robust either.
John, I agree - this bonding mode should be used in quite limited number
of situations, but as for failure farther away then immediate link -
every bonding mode will suffer same problems in this case - bonding
detects only L2 failures, other is done by upper-layer mechanisms. And
almost all bonding modes depend on equal RTT on slaves. And, there is
already similar load balancing mode - balance-alb - what I did is
approximately the same, but for 802.3ad bonding mode and provides
"better"(more equal and non-conditional layser2) load striping for tx
and _rx_ .
I think I shouldn't mention the particular use case of this patch - when
I wrote it I tried to make a more general solution - my goal was "make
equal or near-equal load striping for TX and (most important part) RX
within single ethernet(layer 2) domain for TCP transmission". This
bonding mode just introduces ability to stripe rx and tx load for
single TCP connection between hosts inside of one ethernet segment.
iSCSI is just an example. It is possible to stripe load between a
linux-based router and linux-based web/ftp/etc server as well in the
same manner. I think this feature will be useful in some number of
network configurations.
Also, I looked into net-next code - it seems to me that it can be
implemented(adapted to net-next bonding code) without any difficulties
and hashing function change makes no problem here.
What I've written below is just my personal experience and opinion after
5 years of using Oracle +iSCSI +mpath(later - patched bonding).
From my personal experience I just can say that most iSCSI failures are
caused by link failures, and also I would never send any significant
iSCSI traffic via router - router would be a bottleneck in this case.
So, in my case iSCSI traffic flows within one ethernet domain and in
case of link failure bonding driver simply fails one slave(in case of
bonding) , instead of checking and failing hundreths of paths (in case
of mpath) and first case significantly less cpu, net and time
consuming(if using default mpath checker - readsector0).
Mpath is good for me, when I use it to "merge" drbd mirrors from
different hosts, but for just doing simple load striping within single
L2 network switch between 2 .. 16 hosts is some overkill(particularly
in maintaining human-readable device naming) :).
John, what is you opinion on such load balancing method in general,
without referring to particular use cases?
>
> You could tweak your scsi timeout values and fail_fast values, set the io
> retry to 0 to cause the fail over to occur faster. I suspect you already
> did this and still it is too slow? Maybe adding a checker in multipathd to
> listen for link events would be fast enough. The checker could then fail
> the path immediately.
>
> I'll try to address your comments from the other thread here. In general I
> wonder if it would be better to solve the problems in dm-multipath rather than
> add another bonding mode?
Of course I did this, but mpath is fine when device quantity is below
30-40 devices with two paths, 150-200 devices with 2+ paths can make
life far more interesting :)
>
> OVU - it is slow(I am using ISCSI for Oracle , so I need to minimize latency)
>
> The dm-multipath layer is adding latency? How much? If this is really true
> maybe its best to the address the real issue here and not avoid it by
> using the bonding layer.
I do not remember exact number now, but switching one of my databases ,
about 2 years ago to bonding increased read throughput for the entire db
from 15-20 Tb/day to approximately 30-35 Tb/day (4 iscsi initiators and
8 iscsi targets, 4 ethernet links for iSCSI on each host, all plugged in
one switch) because of "full" bandwidth use. Also, bonding usage
simplifies network and application setup greatly(compared to mpath)
>
> OVU - it handles any link failures bad, because of it's command queue
> limitation(all queued commands above 32 are discarded in case of path
> failure, as I remember)
>
> Maybe true but only link failures with the immediate peer are handled
> with a bonding strategy. By working at the block layer we can detect
> failures throughout the path. I would need to look into this again I
> know when we were looking at this sometime ago there was some talk about
> improving this behavior. I need to take some time to go back through the
> error recovery stuff to remember how this works.
>
> OVU - it performs very bad when there are many devices and maтy paths(I was
> unable to utilize more that 2Gbps of 4 even with 100 disks with 4 paths
> per each disk)
Well, I think that behavior can be explained in such a way:
when balancing by I/Os number per path(rr_min_io), and there is a huge
number of devices, mpath is doing load-balaning per-device, and it is
not possible to quarantee equal device use for all devices, so there
will be imbalance over network interface(mpath is unaware of it's
existence, etc), and it is likely it becomes more imbalanced when there
are many devices. Also, counting I/O's for many devices and paths
consumes some CPU resources and also can cause excessive context switches.
>
> Hmm well that seems like something is broken. I'll try this setup when
> I get some time next few days. This really shouldn't be the case dm-multipath
> should not add a bunch of extra latency or effect throughput significantly.
> By the way what are you seeing without mpio?
And one more obsevation from my 2-years old tests - reading device(using
dd) (rhel 5 update 1 kernel, ramdisk via ISCSI via loopback ) as mpath
device with single path was done at approximately 120-150mb/s, and same
test on non-mpath device at 800-900mb/s. Here I am quite sure, it was a
kind of revelation to me that time.
>
> Thanks,
> John
>
--
Best regards,
Oleg Ukhno.
ITO Team Lead,
Yandex LLC.
^ permalink raw reply
* Re: inbound connection problems when "netlink: test for all flags of the NLM_F_DUMP composite" commit applied
From: jamal @ 2011-01-18 14:05 UTC (permalink / raw)
To: Jarek Poplawski
Cc: David Miller, pablo, arthur.marsh, jengelh, eric.dumazet, netdev
In-Reply-To: <20110118102437.GB7520@ff.dom.local>
On Tue, 2011-01-18 at 10:24 +0000, Jarek Poplawski wrote:
> Do you all expect all users manage to upgrade avahi app before
> changing their stable kernel? I mean "own distro" users especially.
Unfortunately if that app is widely deployed, it is not pragmatic
to break it in the name of pedanticity. i.e.
Be conservative in what you send (clearly Avahi is farting all over the
place) but more importantly be a nice liberal in what you accept.
Maybe tell them if you have the cycles about their bad behavior.
The important part is the GET (kind = 2). The DUMP as Jarek says
is merely a utility to extrapolate that we need you to
get everything.. So it is not such a big deal if someone passes
extraneous senseless flags. Wrong? yes.
Jarek - For the record although i coauthored the doc, I was merely
a messenger in putting together some artist painting.
cheers,
jamal
^ permalink raw reply
* Re: [PATCH resend] netfilter: change IPS_*_BIT to IPS_*
From: Patrick McHardy @ 2011-01-18 14:05 UTC (permalink / raw)
To: Changli Gao
Cc: David S. Miller, netfilter-devel, netdev, Tim Gardner,
Eric Dumazet
In-Reply-To: <1295090445-14431-1-git-send-email-xiaosuo@gmail.com>
On 15.01.2011 12:20, Changli Gao wrote:
> My previous patch made a mistake when converting atomic_set to a normal
> bit 'or'. IPS_*_BIT should be replaced with IPS_*.
Then please state this clearly in the subject instead of calling it
a resend. Also we use "netfilter: <subsystem>: <change description>",
as I've told you multiple times already.
>
> commit 76a2d3bcfcc86e2a8044258515b86492a37631a3
> Author: Changli Gao <xiaosuo@gmail.com>
> Date: Mon Nov 15 11:59:03 2010 +0100
>
> netfilter: nf_nat: don't use atomic bit operation
>
> As we own the conntrack and the others can't see it until we confirm it,
> we don't need to use atomic bit operation on ct->status.
Applied, thanks.
^ permalink raw reply
* Re: inbound connection problems when "netlink: test for all flags of the NLM_F_DUMP composite" commit applied
From: jamal @ 2011-01-18 14:07 UTC (permalink / raw)
To: Jarek Poplawski
Cc: David Miller, pablo, arthur.marsh, jengelh, eric.dumazet, netdev
In-Reply-To: <1295359503.2066.10.camel@mojatatu>
On Tue, 2011-01-18 at 09:05 -0500, jamal wrote:
> On Tue, 2011-01-18 at 10:24 +0000, Jarek Poplawski wrote:
>
> > Do you all expect all users manage to upgrade avahi app before
> > changing their stable kernel? I mean "own distro" users especially.
>
> Unfortunately if that app is widely deployed, it is not pragmatic
> to break it in the name of pedanticity.
And to complete that thought - if avahi continues to work and merely
whines, i dont see why this patch should be reverted..
cheers,
jamal
^ permalink raw reply
* Re: [PATCH v2 resend] netfilter: remove an atomic bit operation
From: Patrick McHardy @ 2011-01-18 14:08 UTC (permalink / raw)
To: Changli Gao
Cc: David S. Miller, netfilter-devel, netdev, Tim Gardner,
Eric Dumazet
In-Reply-To: <1295090580-14472-1-git-send-email-xiaosuo@gmail.com>
On 15.01.2011 12:23, Changli Gao wrote:
> As this ct won't be seen by the others, we don't need to set the
> IPS_CONFIRMED_BIT in atomic way.
>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH] ns83820: Avoid bad pointer deref in ns83820_init_one().
From: Denis Kirjanov @ 2011-01-18 14:11 UTC (permalink / raw)
To: Jesper Juhl
Cc: netdev, linux-ns83820, linux-kernel, Tejun Heo, Kulikov Vasiliy,
David S. Miller, Benjamin LaHaise
In-Reply-To: <alpine.LNX.2.00.1101172116330.27021@swampdragon.chaosbits.net>
On Mon, Jan 17, 2011 at 09:24:57PM +0100, Jesper Juhl wrote:
> In drivers/net/ns83820.c::ns83820_init_one() we dynamically allocate
> memory via alloc_etherdev(). We then call PRIV() on the returned storage
> which is 'return netdev_priv()'. netdev_priv() takes the pointer it is
> passed and adds 'ALIGN(sizeof(struct net_device), NETDEV_ALIGN)' to it and
> returns it. Then we test the resulting pointer for NULL, which it is
> unlikely to be at this point, and later dereference it. This will go bad
> if alloc_etherdev() actually returned NULL.
>
> This patch reworks the code slightly so that we test for a NULL pointer
> (and return -ENOMEM) directly after calling alloc_etherdev().
>
> Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Yeah, the previous code was a little bit ugly.
Good catch!
> ---
> ns83820.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> Compile tested only. I have no way to test this for real.
>
> diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
> index 84134c7..a41b2cf 100644
> --- a/drivers/net/ns83820.c
> +++ b/drivers/net/ns83820.c
> @@ -1988,12 +1988,11 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev,
> }
>
> ndev = alloc_etherdev(sizeof(struct ns83820));
> - dev = PRIV(ndev);
> -
> err = -ENOMEM;
> - if (!dev)
> + if (!ndev)
> goto out;
>
> + dev = PRIV(ndev);
> dev->ndev = ndev;
>
> spin_lock_init(&dev->rx_info.lock);
>
>
> --
> Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
> Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
> Plain text mails only, please.
^ permalink raw reply
* Re: [PATCH resend] netfilter: place in source hash after SNAT is done
From: Patrick McHardy @ 2011-01-18 14:17 UTC (permalink / raw)
To: Changli Gao; +Cc: David S. Miller, netfilter-devel, netdev
In-Reply-To: <1295090930-16671-1-git-send-email-xiaosuo@gmail.com>
On 15.01.2011 12:28, Changli Gao wrote:
> If SNAT isn't done, the wrong info maybe got by the other cts.
>
> As the filter table is after DNAT table, the packets dropped in filter
> table also bother bysource hash table.
>
> Signed-off-by: Changli Gao <xiaosuo@gmail.com>
> ---
> net/ipv4/netfilter/nf_nat_core.c | 18 +++++++++++-------
> 1 file changed, 11 insertions(+), 7 deletions(-)
> diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c
> index c04787c..51ce55a 100644
> --- a/net/ipv4/netfilter/nf_nat_core.c
> +++ b/net/ipv4/netfilter/nf_nat_core.c
> @@ -221,7 +221,14 @@ get_unique_tuple(struct nf_conntrack_tuple *tuple,
> manips not an issue. */
> if (maniptype == IP_NAT_MANIP_SRC &&
> !(range->flags & IP_NAT_RANGE_PROTO_RANDOM)) {
> - if (find_appropriate_src(net, zone, orig_tuple, tuple, range)) {
> + /* try the original tuple first */
This doesn't seem to be related to the hashing change. Please describe
the intention behind this change.
> + if (in_range(orig_tuple, range)) {
> + if (!nf_nat_used_tuple(orig_tuple, ct)) {
> + *tuple = *orig_tuple;
> + return;
> + }
> + } else if (find_appropriate_src(net, zone, orig_tuple, tuple,
> + range)) {
> pr_debug("get_unique_tuple: Found current src map\n");
> if (!nf_nat_used_tuple(tuple, ct))
> return;
^ permalink raw reply
* [patch 0/4] Ipset fixes
From: holger @ 2011-01-18 14:21 UTC (permalink / raw)
To: Jozsef Kadlecsik; +Cc: netfilter-devel, netdev
Hi Jozsef,
what follows are some small improvements and fixes for ipset 5.
Please take a look. Thanks!
/holger
--
^ permalink raw reply
* [patch 3/4] ipset: do session initialization once
From: holger @ 2011-01-18 14:21 UTC (permalink / raw)
To: Jozsef Kadlecsik; +Cc: netfilter-devel, netdev
In-Reply-To: <20110118142154.697547841@eitzenberger.org>
[-- Attachment #1: ipset-one-time-session-init.diff --]
[-- Type: text/plain, Size: 988 bytes --]
Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>
Index: ipset/src/ipset.c
===================================================================
--- ipset.orig/src/ipset.c 2011-01-05 12:05:31.000000000 +0100
+++ ipset/src/ipset.c 2011-01-05 12:07:02.000000000 +0100
@@ -431,14 +431,6 @@
const struct ipset_commands *command;
const struct ipset_type *type;
- /* Initialize session */
- if (session == NULL) {
- session = ipset_session_init(printf);
- if (session == NULL)
- return exit_error(OTHER_PROBLEM,
- "Cannot initialize ipset session, aborting.");
- }
-
/* Commandline parsing, somewhat similar to that of 'ip' */
/* First: parse core options */
@@ -743,5 +735,10 @@
ipset_type_add(&ipset_hash_ipportnet0);
ipset_type_add(&ipset_list_set0);
+ session = ipset_session_init(printf);
+ if (session == NULL)
+ return exit_error(OTHER_PROBLEM,
+ "Cannot initialize ipset session, aborting.");
+
return parse_commandline(argc, argv);
}
--
^ permalink raw reply
* [patch 1/4] ipset: show correct line numbers in restore output
From: holger @ 2011-01-18 14:21 UTC (permalink / raw)
To: Jozsef Kadlecsik; +Cc: netfilter-devel, netdev
In-Reply-To: <20110118142154.697547841@eitzenberger.org>
[-- Attachment #1: ipset-show-correct-line-number.diff --]
[-- Type: text/plain, Size: 779 bytes --]
When passing something like
create foo6 hash:ip hashsize 64 family inet6
add foo6 20a1:1234:5678::/64
add foo6 20a1:1234:5679::/64
you get:
ipset v5.2: Error in line 1: Syntax error: plain IP address must be supplied: 20a1:1234:5678::/64
Should be line 2 though.
Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>
Index: ipset/lib/session.c
===================================================================
--- ipset.orig/lib/session.c 2011-01-05 18:59:59.000000000 +0100
+++ ipset/lib/session.c 2011-01-07 13:11:33.000000000 +0100
@@ -194,7 +194,7 @@
if (session->lineno != 0 && type == IPSET_ERROR) {
sprintf(session->report, "Error in line %u: ",
- session->lineno);
+ session->lineno + 1);
}
offset = strlen(session->report);
--
^ permalink raw reply
* [patch 2/4] ipset: make IPv4 and IPv6 address handling similar
From: holger @ 2011-01-18 14:21 UTC (permalink / raw)
To: Jozsef Kadlecsik; +Cc: netfilter-devel, netdev
In-Reply-To: <20110118142154.697547841@eitzenberger.org>
[-- Attachment #1: ipset-fix-ipv6-netmask-parsing.diff --]
[-- Type: text/plain, Size: 760 bytes --]
While the following works for AF_INET:
ipset add foo 192.168.1.1/32
this does not work for AF_INET6:
ipset add foo6 20a1:1:2:3:4:5:6:7/128
ipset v5.2: Syntax error: plain IP address must be supplied: 20a1:1:2:3:4:5:6:7/128
Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>
Index: ipset/lib/parse.c
===================================================================
--- ipset.orig/lib/parse.c 2011-01-14 11:14:41.000000000 +0100
+++ ipset/lib/parse.c 2011-01-14 11:15:06.000000000 +0100
@@ -960,9 +960,7 @@
ipset_data_set(data, IPSET_OPT_FAMILY, &family);
}
- return family == AF_INET ? ipset_parse_ip(session, opt, str)
- : ipset_parse_single_ip(session, opt, str);
-
+ return ipset_parse_ip(session, opt, str);
}
/**
--
^ permalink raw reply
* [patch 4/4] ipset: fix build with NDEBUG defined
From: holger @ 2011-01-18 14:21 UTC (permalink / raw)
To: Jozsef Kadlecsik; +Cc: netfilter-devel, netdev
In-Reply-To: <20110118142154.697547841@eitzenberger.org>
[-- Attachment #1: ipset-fix-NDEBUG.diff --]
[-- Type: text/plain, Size: 1021 bytes --]
The usage of the gcc option -Wunused-parameter interferes badly with
the assert() macros. In case -DNDEBUG is specified build fails with:
cc1: warnings being treated as errors
print.c: In function 'ipset_print_family':
print.c:92: error: unused parameter 'opt'
print.c: In function 'ipset_print_port':
print.c:413: error: unused parameter 'opt'
print.c: In function 'ipset_print_proto':
A possible fix is just to remove -Wunused, as -Wextra + -Wunused enables
-Wunused-paramter.
Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>
Index: ipset/configure.ac
===================================================================
--- ipset.orig/configure.ac 2011-01-18 14:47:46.000000000 +0100
+++ ipset/configure.ac 2011-01-18 14:56:11.000000000 +0100
@@ -144,7 +144,6 @@
AX_CFLAGS_GCC_OPTION(-Wstrict-prototypes)
AX_CFLAGS_GCC_OPTION(-Wswitch-default)
AX_CFLAGS_GCC_OPTION(-Wundef)
-AX_CFLAGS_GCC_OPTION(-Wunused)
AX_CFLAGS_GCC_OPTION(-Wwrite-strings)
dnl Checks for library functions.
--
^ permalink raw reply
* [PATCH net-2.6 0/8] bnx2x: Minor link related fixes
From: Yaniv Rosner @ 2011-01-18 14:33 UTC (permalink / raw)
To: davem; +Cc: netdev, eilong
Hi Dave,
The following patch series describe some link fixes in bnx2x driver
Please consider applying it to net-next-2.6.
Thanks,
Yaniv
^ permalink raw reply
* [PATCH net-2.6 1/8] bnx2x: Swap BCM8073 PHY polarity if required
From: Yaniv Rosner @ 2011-01-18 14:33 UTC (permalink / raw)
To: davem; +Cc: netdev, eilong
Enable controlling BCM8073 PN polarity swap through nvm configuration, which is required in certain systems
Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
drivers/net/bnx2x/bnx2x_hsi.h | 4 +++
drivers/net/bnx2x/bnx2x_link.c | 42 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x_hsi.h b/drivers/net/bnx2x/bnx2x_hsi.h
index 6238d4f..548f563 100644
--- a/drivers/net/bnx2x/bnx2x_hsi.h
+++ b/drivers/net/bnx2x/bnx2x_hsi.h
@@ -352,6 +352,10 @@ struct port_hw_cfg { /* port 0: 0x12c port 1: 0x2bc */
#define PORT_HW_CFG_LANE_SWAP_CFG_31203120 0x0000d8d8
/* forced only */
#define PORT_HW_CFG_LANE_SWAP_CFG_32103210 0x0000e4e4
+ /* Indicate whether to swap the external phy polarity */
+#define PORT_HW_CFG_SWAP_PHY_POLARITY_MASK 0x00010000
+#define PORT_HW_CFG_SWAP_PHY_POLARITY_DISABLED 0x00000000
+#define PORT_HW_CFG_SWAP_PHY_POLARITY_ENABLED 0x00010000
u32 external_phy_config;
#define PORT_HW_CFG_SERDES_EXT_PHY_TYPE_MASK 0xff000000
diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c
index 43b0de2..77f9eb1 100644
--- a/drivers/net/bnx2x/bnx2x_link.c
+++ b/drivers/net/bnx2x/bnx2x_link.c
@@ -4108,6 +4108,25 @@ static u8 bnx2x_8073_config_init(struct bnx2x_phy *phy,
DP(NETIF_MSG_LINK, "Before rom RX_ALARM(port1): 0x%x\n", tmp1);
+ /**
+ * If this is forced speed, set to KR or KX (all other are not
+ * supported)
+ */
+ /* Swap polarity if required - Must be done only in non-1G mode */
+ if (params->lane_config & PORT_HW_CFG_SWAP_PHY_POLARITY_ENABLED) {
+ /* Configure the 8073 to swap _P and _N of the KR lines */
+ DP(NETIF_MSG_LINK, "Swapping polarity for the 8073\n");
+ /* 10G Rx/Tx and 1G Tx signal polarity swap */
+ bnx2x_cl45_read(bp, phy,
+ MDIO_PMA_DEVAD,
+ MDIO_PMA_REG_8073_OPT_DIGITAL_CTRL, &val);
+ bnx2x_cl45_write(bp, phy,
+ MDIO_PMA_DEVAD,
+ MDIO_PMA_REG_8073_OPT_DIGITAL_CTRL,
+ (val | (3<<9)));
+ }
+
+
/* Enable CL37 BAM */
if (REG_RD(bp, params->shmem_base +
offsetof(struct shmem_region, dev_info.
@@ -4314,6 +4333,29 @@ static u8 bnx2x_8073_read_status(struct bnx2x_phy *phy,
}
if (link_up) {
+ /* Swap polarity if required */
+ if (params->lane_config &
+ PORT_HW_CFG_SWAP_PHY_POLARITY_ENABLED) {
+ /* Configure the 8073 to swap P and N of the KR lines */
+ bnx2x_cl45_read(bp, phy,
+ MDIO_XS_DEVAD,
+ MDIO_XS_REG_8073_RX_CTRL_PCIE, &val1);
+ /**
+ * Set bit 3 to invert Rx in 1G mode and clear this bit
+ * when it`s in 10G mode.
+ */
+ if (vars->line_speed == SPEED_1000) {
+ DP(NETIF_MSG_LINK, "Swapping 1G polarity for"
+ "the 8073\n");
+ val1 |= (1<<3);
+ } else
+ val1 &= ~(1<<3);
+
+ bnx2x_cl45_write(bp, phy,
+ MDIO_XS_DEVAD,
+ MDIO_XS_REG_8073_RX_CTRL_PCIE,
+ val1);
+ }
bnx2x_ext_phy_10G_an_resolve(bp, phy, vars);
bnx2x_8073_resolve_fc(phy, params, vars);
}
--
1.7.1
^ permalink raw reply related
* [PATCH net-2.6 2/8] bnx2x: Common init will be executed only once after POR
From: Yaniv Rosner @ 2011-01-18 14:33 UTC (permalink / raw)
To: davem; +Cc: netdev, eilong
Common init used to be called by the driver when the first port comes up, mainly to reset and reload external PHY microcode.
However, in case management driver is active on the other port, traffic would halted. So limit the common init to be done only once after POR.
Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
drivers/net/bnx2x/bnx2x_link.c | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c
index 77f9eb1..bdf3c67 100644
--- a/drivers/net/bnx2x/bnx2x_link.c
+++ b/drivers/net/bnx2x/bnx2x_link.c
@@ -7958,6 +7958,7 @@ u8 bnx2x_common_init_phy(struct bnx2x *bp, u32 shmem_base_path[],
u32 shmem2_base_path[], u32 chip_id)
{
u8 rc = 0;
+ u32 phy_ver;
u8 phy_index;
u32 ext_phy_type, ext_phy_config;
DP(NETIF_MSG_LINK, "Begin common phy init\n");
@@ -7965,6 +7966,16 @@ u8 bnx2x_common_init_phy(struct bnx2x *bp, u32 shmem_base_path[],
if (CHIP_REV_IS_EMUL(bp))
return 0;
+ /* Check if common init was already done */
+ phy_ver = REG_RD(bp, shmem_base_path[0] +
+ offsetof(struct shmem_region,
+ port_mb[PORT_0].ext_phy_fw_version));
+ if (phy_ver) {
+ DP(NETIF_MSG_LINK, "Not doing common init; phy ver is 0x%x\n",
+ phy_ver);
+ return 0;
+ }
+
/* Read the ext_phy_type for arbitrary port(0) */
for (phy_index = EXT_PHY1; phy_index < MAX_PHYS;
phy_index++) {
--
1.7.1
^ permalink raw reply related
* [PATCH net-2.6 3/8] bnx2x: LED fix for BCM8727 over BCM57712
From: Yaniv Rosner @ 2011-01-18 14:33 UTC (permalink / raw)
To: davem; +Cc: netdev, eilong
LED on BCM57712+BCM8727 systems requires different settings
Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
drivers/net/bnx2x/bnx2x_link.c | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c
index bdf3c67..36a8844 100644
--- a/drivers/net/bnx2x/bnx2x_link.c
+++ b/drivers/net/bnx2x/bnx2x_link.c
@@ -3166,7 +3166,23 @@ u8 bnx2x_set_led(struct link_params *params,
if (!vars->link_up)
break;
case LED_MODE_ON:
- if (SINGLE_MEDIA_DIRECT(params)) {
+ if (params->phy[EXT_PHY1].type ==
+ PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727 &&
+ CHIP_IS_E2(bp) && params->num_phys == 2) {
+ /**
+ * This is a work-around for E2+8727 Configurations
+ */
+ if (mode == LED_MODE_ON ||
+ speed == SPEED_10000){
+ REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4, 0);
+ REG_WR(bp, NIG_REG_LED_10G_P0 + port*4, 1);
+
+ tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
+ EMAC_WR(bp, EMAC_REG_EMAC_LED,
+ (tmp | EMAC_LED_OVERRIDE));
+ return rc;
+ }
+ } else if (SINGLE_MEDIA_DIRECT(params)) {
/**
* This is a work-around for HW issue found when link
* is up in CL73
--
1.7.1
^ permalink raw reply related
* [PATCH net-2.6 4/8] bnx2x: Fix BCM8073/BCM8727 microcode loading
From: Yaniv Rosner @ 2011-01-18 14:33 UTC (permalink / raw)
To: davem; +Cc: netdev, eilong
Improve microcode loading verification before proceeding to next stage
Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
drivers/net/bnx2x/bnx2x_link.c | 73 +++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 30 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c
index 36a8844..500258d 100644
--- a/drivers/net/bnx2x/bnx2x_link.c
+++ b/drivers/net/bnx2x/bnx2x_link.c
@@ -3870,11 +3870,14 @@ static void bnx2x_8073_resolve_fc(struct bnx2x_phy *phy,
pause_result);
}
}
-
-static void bnx2x_8073_8727_external_rom_boot(struct bnx2x *bp,
+static u8 bnx2x_8073_8727_external_rom_boot(struct bnx2x *bp,
struct bnx2x_phy *phy,
u8 port)
{
+ u32 count = 0;
+ u16 fw_ver1, fw_msgout;
+ u8 rc = 0;
+
/* Boot port from external ROM */
/* EDC grst */
bnx2x_cl45_write(bp, phy,
@@ -3904,14 +3907,45 @@ static void bnx2x_8073_8727_external_rom_boot(struct bnx2x *bp,
MDIO_PMA_REG_GEN_CTRL,
MDIO_PMA_REG_GEN_CTRL_ROM_RESET_INTERNAL_MP);
- /* wait for 120ms for code download via SPI port */
- msleep(120);
+ /* Delay 100ms per the PHY specifications */
+ msleep(100);
+
+ /* 8073 sometimes taking longer to download */
+ do {
+ count++;
+ if (count > 300) {
+ DP(NETIF_MSG_LINK,
+ "bnx2x_8073_8727_external_rom_boot port %x:"
+ "Download failed. fw version = 0x%x\n",
+ port, fw_ver1);
+ rc = -EINVAL;
+ break;
+ }
+
+ bnx2x_cl45_read(bp, phy,
+ MDIO_PMA_DEVAD,
+ MDIO_PMA_REG_ROM_VER1, &fw_ver1);
+ bnx2x_cl45_read(bp, phy,
+ MDIO_PMA_DEVAD,
+ MDIO_PMA_REG_M8051_MSGOUT_REG, &fw_msgout);
+
+ msleep(1);
+ } while (fw_ver1 == 0 || fw_ver1 == 0x4321 ||
+ ((fw_msgout & 0xff) != 0x03 && (phy->type ==
+ PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073)));
/* Clear ser_boot_ctl bit */
bnx2x_cl45_write(bp, phy,
MDIO_PMA_DEVAD,
MDIO_PMA_REG_MISC_CTRL1, 0x0000);
bnx2x_save_bcm_spirom_ver(bp, phy, port);
+
+ DP(NETIF_MSG_LINK,
+ "bnx2x_8073_8727_external_rom_boot port %x:"
+ "Download complete. fw version = 0x%x\n",
+ port, fw_ver1);
+
+ return rc;
}
static void bnx2x_8073_set_xaui_low_power_mode(struct bnx2x *bp,
@@ -7721,7 +7755,6 @@ static u8 bnx2x_8073_common_init_phy(struct bnx2x *bp,
/* PART2 - Download firmware to both phys */
for (port = PORT_MAX - 1; port >= PORT_0; port--) {
- u16 fw_ver1;
if (CHIP_IS_E2(bp))
port_of_path = 0;
else
@@ -7729,19 +7762,9 @@ static u8 bnx2x_8073_common_init_phy(struct bnx2x *bp,
DP(NETIF_MSG_LINK, "Loading spirom for phy address 0x%x\n",
phy_blk[port]->addr);
- bnx2x_8073_8727_external_rom_boot(bp, phy_blk[port],
- port_of_path);
-
- bnx2x_cl45_read(bp, phy_blk[port],
- MDIO_PMA_DEVAD,
- MDIO_PMA_REG_ROM_VER1, &fw_ver1);
- if (fw_ver1 == 0 || fw_ver1 == 0x4321) {
- DP(NETIF_MSG_LINK,
- "bnx2x_8073_common_init_phy port %x:"
- "Download failed. fw version = 0x%x\n",
- port, fw_ver1);
+ if (bnx2x_8073_8727_external_rom_boot(bp, phy_blk[port],
+ port_of_path))
return -EINVAL;
- }
/* Only set bit 10 = 1 (Tx power down) */
bnx2x_cl45_read(bp, phy_blk[port],
@@ -7906,27 +7929,17 @@ static u8 bnx2x_8727_common_init_phy(struct bnx2x *bp,
}
/* PART2 - Download firmware to both phys */
for (port = PORT_MAX - 1; port >= PORT_0; port--) {
- u16 fw_ver1;
if (CHIP_IS_E2(bp))
port_of_path = 0;
else
port_of_path = port;
DP(NETIF_MSG_LINK, "Loading spirom for phy address 0x%x\n",
phy_blk[port]->addr);
- bnx2x_8073_8727_external_rom_boot(bp, phy_blk[port],
- port_of_path);
- bnx2x_cl45_read(bp, phy_blk[port],
- MDIO_PMA_DEVAD,
- MDIO_PMA_REG_ROM_VER1, &fw_ver1);
- if (fw_ver1 == 0 || fw_ver1 == 0x4321) {
- DP(NETIF_MSG_LINK,
- "bnx2x_8727_common_init_phy port %x:"
- "Download failed. fw version = 0x%x\n",
- port, fw_ver1);
+ if (bnx2x_8073_8727_external_rom_boot(bp, phy_blk[port],
+ port_of_path))
return -EINVAL;
- }
- }
+ }
return 0;
}
--
1.7.1
^ permalink raw reply related
* [PATCH net-2.6 5/8] bnx2x: Mark full duplex on some external PHYs
From: Yaniv Rosner @ 2011-01-18 14:33 UTC (permalink / raw)
To: davem; +Cc: netdev, eilong
Device may show incorrect duplex mode for devices with external PHY
Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
drivers/net/bnx2x/bnx2x_link.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c
index 500258d..f5fd33e 100644
--- a/drivers/net/bnx2x/bnx2x_link.c
+++ b/drivers/net/bnx2x/bnx2x_link.c
@@ -4408,6 +4408,7 @@ static u8 bnx2x_8073_read_status(struct bnx2x_phy *phy,
}
bnx2x_ext_phy_10G_an_resolve(bp, phy, vars);
bnx2x_8073_resolve_fc(phy, params, vars);
+ vars->duplex = DUPLEX_FULL;
}
return link_up;
}
@@ -5154,6 +5155,7 @@ static u8 bnx2x_8706_8726_read_status(struct bnx2x_phy *phy,
else
vars->line_speed = SPEED_10000;
bnx2x_ext_phy_resolve_fc(phy, params, vars);
+ vars->duplex = DUPLEX_FULL;
}
return link_up;
}
@@ -5850,8 +5852,11 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
DP(NETIF_MSG_LINK, "port %x: External link is down\n",
params->port);
}
- if (link_up)
+ if (link_up) {
bnx2x_ext_phy_resolve_fc(phy, params, vars);
+ vars->duplex = DUPLEX_FULL;
+ DP(NETIF_MSG_LINK, "duplex = 0x%x\n", vars->duplex);
+ }
if ((DUAL_MEDIA(params)) &&
(phy->req_line_speed == SPEED_1000)) {
@@ -6218,6 +6223,7 @@ static u8 bnx2x_848xx_read_status(struct bnx2x_phy *phy,
/* Check link 10G */
if (val2 & (1<<11)) {
vars->line_speed = SPEED_10000;
+ vars->duplex = DUPLEX_FULL;
link_up = 1;
bnx2x_ext_phy_10G_an_resolve(bp, phy, vars);
} else { /* Check Legacy speed link */
@@ -6581,6 +6587,7 @@ static u8 bnx2x_7101_read_status(struct bnx2x_phy *phy,
MDIO_AN_DEVAD, MDIO_AN_REG_MASTER_STATUS,
&val2);
vars->line_speed = SPEED_10000;
+ vars->duplex = DUPLEX_FULL;
DP(NETIF_MSG_LINK, "SFX7101 AN status 0x%x->Master=%x\n",
val2, (val2 & (1<<14)));
bnx2x_ext_phy_10G_an_resolve(bp, phy, vars);
--
1.7.1
^ permalink raw reply related
* [PATCH net-2.6 6/8] bnx2x: Fix BCM84823 LED behavior
From: Yaniv Rosner @ 2011-01-18 14:33 UTC (permalink / raw)
To: davem; +Cc: netdev, eilong
Fix BCM84823 LED behavior which may show on some systems
Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
drivers/net/bnx2x/bnx2x_link.c | 18 +++++++++++++++++-
drivers/net/bnx2x/bnx2x_reg.h | 4 ++++
2 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c
index f5fd33e..bb1c811 100644
--- a/drivers/net/bnx2x/bnx2x_link.c
+++ b/drivers/net/bnx2x/bnx2x_link.c
@@ -5972,10 +5972,26 @@ static void bnx2x_848xx_set_led(struct bnx2x *bp,
MDIO_PMA_REG_8481_LED2_MASK,
0x18);
+ /* Select activity source by Tx and Rx, as suggested by PHY AE */
bnx2x_cl45_write(bp, phy,
MDIO_PMA_DEVAD,
MDIO_PMA_REG_8481_LED3_MASK,
- 0x0040);
+ 0x0006);
+
+ /* Select the closest activity blink rate to that in 10/100/1000 */
+ bnx2x_cl45_write(bp, phy,
+ MDIO_PMA_DEVAD,
+ MDIO_PMA_REG_8481_LED3_BLINK,
+ 0);
+
+ bnx2x_cl45_read(bp, phy,
+ MDIO_PMA_DEVAD,
+ MDIO_PMA_REG_84823_CTL_LED_CTL_1, &val);
+ val |= MDIO_PMA_REG_84823_LED3_STRETCH_EN; /* stretch_en for LED3*/
+
+ bnx2x_cl45_write(bp, phy,
+ MDIO_PMA_DEVAD,
+ MDIO_PMA_REG_84823_CTL_LED_CTL_1, val);
/* 'Interrupt Mask' */
bnx2x_cl45_write(bp, phy,
diff --git a/drivers/net/bnx2x/bnx2x_reg.h b/drivers/net/bnx2x/bnx2x_reg.h
index 38ef7ca..73efc9b 100644
--- a/drivers/net/bnx2x/bnx2x_reg.h
+++ b/drivers/net/bnx2x/bnx2x_reg.h
@@ -6194,7 +6194,11 @@ Theotherbitsarereservedandshouldbezero*/
#define MDIO_CTL_REG_84823_MEDIA_PRIORITY_COPPER 0x0000
#define MDIO_CTL_REG_84823_MEDIA_PRIORITY_FIBER 0x0100
#define MDIO_CTL_REG_84823_MEDIA_FIBER_1G 0x1000
+#define MDIO_CTL_REG_84823_USER_CTRL_REG 0x4005
+#define MDIO_CTL_REG_84823_USER_CTRL_CMS 0x0080
+#define MDIO_PMA_REG_84823_CTL_LED_CTL_1 0xa8e3
+#define MDIO_PMA_REG_84823_LED3_STRETCH_EN 0x0080
#define IGU_FUNC_BASE 0x0400
--
1.7.1
^ permalink raw reply related
* [PATCH net-2.6 7/8] bnx2x: Fix AER setting for BCM57712
From: Yaniv Rosner @ 2011-01-18 14:33 UTC (permalink / raw)
To: davem; +Cc: netdev, eilong
Fix AER settings for BCM57712 to allow accessing all device addresses range in CL45 MDC/MDIO
Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
drivers/net/bnx2x/bnx2x_link.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c
index bb1c811..7160ec5 100644
--- a/drivers/net/bnx2x/bnx2x_link.c
+++ b/drivers/net/bnx2x/bnx2x_link.c
@@ -1573,7 +1573,7 @@ static void bnx2x_set_aer_mmd_xgxs(struct link_params *params,
offset = phy->addr + ser_lane;
if (CHIP_IS_E2(bp))
- aer_val = 0x2800 + offset - 1;
+ aer_val = 0x3800 + offset - 1;
else
aer_val = 0x3800 + offset;
CL45_WR_OVER_CL22(bp, phy,
--
1.7.1
^ permalink raw reply related
* [PATCH net-2.6 8/8] bnx2x: Update bnx2x version to 1.62.00-4
From: Yaniv Rosner @ 2011-01-18 14:33 UTC (permalink / raw)
To: davem; +Cc: netdev, eilong
Update bnx2x version to 1.62.00-4
Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
drivers/net/bnx2x/bnx2x.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index 6a858a2..e56a45c 100644
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -22,8 +22,8 @@
* (you will need to reboot afterwards) */
/* #define BNX2X_STOP_ON_ERROR */
-#define DRV_MODULE_VERSION "1.62.00-3"
-#define DRV_MODULE_RELDATE "2010/12/21"
+#define DRV_MODULE_VERSION "1.62.00-4"
+#define DRV_MODULE_RELDATE "2011/01/18"
#define BNX2X_BC_VER 0x040200
#define BNX2X_MULTI_QUEUE
--
1.7.1
^ permalink raw reply related
* Re: [PATCH net-2.6 0/8] bnx2x: Minor link related fixes
From: Yaniv Rosner @ 2011-01-18 14:44 UTC (permalink / raw)
To: davem; +Cc: netdev, eilong
In-Reply-To: <1295361191.5281.83.camel@lb-tlvb-dmitry>
Hi Dave,
I meant net-2.6, and not net-next-2.6
Thanks,
Yaniv
On Tue, 2011-01-18 at 16:33 +0200, Yaniv Rosner wrote:
> Hi Dave,
> The following patch series describe some link fixes in bnx2x driver
> Please consider applying it to net-next-2.6.
>
> Thanks,
> Yaniv
>
>
>
>
>
>
>
>
>
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox