* [PATCH v2 1/4] ipv4: match prefsrc when deleting routes
From: Julian Anastasov @ 2011-03-19 22:13 UTC (permalink / raw)
To: netdev; +Cc: David Miller
fib_table_delete forgets to match the routes by prefsrc.
Callers can specify known IP in fc_prefsrc and we should remove
the exact route. This is needed for cases when same local or
broadcast addresses are used in different subnets and the
routes differ only in prefsrc. All callers that do not provide
fc_prefsrc will ignore the route prefsrc as before and will
delete the first occurence. That is how the ip route del default
magic works.
Current callers are:
- ip_rt_ioctl where rtentry_to_fib_config provides fc_prefsrc only
when the provided device name matches IP label with colon.
- inet_rtm_delroute where RTA_PREFSRC is optional too
- fib_magic which deals with routes when deleting addresses
and where the fc_prefsrc is always set with the primary IP
for the concerned IFA.
Signed-off-by: Julian Anastasov <ja@ssi.bg>
---
net/ipv4/fib_trie.c | 2 ++
1 file changed, 2 insertions(+)
diff -urp net-next-2.6-bef55ae/linux/net/ipv4/fib_trie.c linux/net/ipv4/fib_trie.c
--- net-next-2.6-bef55ae/linux/net/ipv4/fib_trie.c 2011-03-13 01:08:55.000000000 +0200
+++ linux/net/ipv4/fib_trie.c 2011-03-16 09:53:26.824191983 +0200
@@ -1665,6 +1665,8 @@ int fib_table_delete(struct fib_table *t
if ((!cfg->fc_type || fa->fa_type == cfg->fc_type) &&
(cfg->fc_scope == RT_SCOPE_NOWHERE ||
fa->fa_scope == cfg->fc_scope) &&
+ (!cfg->fc_prefsrc ||
+ fi->fib_prefsrc == cfg->fc_prefsrc) &&
(!cfg->fc_protocol ||
fi->fib_protocol == cfg->fc_protocol) &&
fib_nh_match(cfg, fi) == 0) {
^ permalink raw reply
* Re: [PATCH 2/4] ipv4: fix route deletion for IPs on many subnets
From: David Miller @ 2011-03-19 22:08 UTC (permalink / raw)
To: ja; +Cc: netdev
In-Reply-To: <alpine.LFD.2.00.1103192339200.2471@ja.ssi.bg>
From: Julian Anastasov <ja@ssi.bg>
Date: Sat, 19 Mar 2011 23:41:36 +0200 (EET)
> It seems my mail client problem is not gone.
> I'll use a script from now on. Will resend all patches 1-4
> as v2 because all are broken.
Ok, thanks.
^ permalink raw reply
* Re: [PATCH 2/4] ipv4: fix route deletion for IPs on many subnets
From: Julian Anastasov @ 2011-03-19 21:41 UTC (permalink / raw)
To: David Miller; +Cc: netdev
In-Reply-To: <20110318.215751.108772214.davem@davemloft.net>
Hello,
On Fri, 18 Mar 2011, David Miller wrote:
> From: Julian Anastasov <ja@ssi.bg>
> Date: Sat, 19 Mar 2011 01:17:01 +0200 (EET)
>
>> + if (ifa->ifa_flags & IFA_F_SECONDARY) {
>> prim = inet_ifa_byprefix(in_dev, any, ifa->ifa_mask);
>> if (prim == NULL) {
>> printk(KERN_WARNING "fib_del_ifaddr: bug: prim == NULL\n");
>> return;
>> }
>> + if (iprim && iprim != prim) {
>> + printk(KERN_WARNING "fib_del_ifaddr: bug: iprim != prim\n");
>> + return;
>> + }
>> + } else if (!ipv4_is_zeronet(any) &&
>> + (any != ifa->ifa_local || ifa->ifa_prefixlen < 32)) {
>> + fib_magic(RTM_DELROUTE,
>> + dev->flags & IFF_LOOPBACK ? RTN_LOCAL : RTN_UNICAST,
>> + any, ifa->ifa_prefixlen, prim);
>> + subnet = 1;
>> }
>>
>> /* Deletion is more complicated than add.
>> @@ -755,6 +769,49 @@ static void fib_del_ifaddr(struct in_ifa
> ...
>> + /* Ignore ifa1 if it uses different primary IP (prefsrc) */
>> + if (ifa1->ifa_flags & IFA_F_SECONDARY) {
>> + /* Another address from our subnet? */
> ...
>> + ifa1->ifa_mask != prim1->ifa_mask ||
>> + !inet_ifa_match(ifa1->ifa_address, prim1))
>> + prim1 = inet_ifa_byprefix(in_dev,
>> + ifa1->ifa_address,
>> + ifa1->ifa_mask);
>
> Julian there exists all kinds of incorrect indentation in this patch,
> could you please fix it up?
It seems my mail client problem is not gone.
I'll use a script from now on. Will resend all patches 1-4
as v2 because all are broken.
Regards
--
Julian Anastasov <ja@ssi.bg>
^ permalink raw reply
* Re: [PATCH] r8169: fix a bug in rtl8169_init_phy()
From: David Miller @ 2011-03-19 20:38 UTC (permalink / raw)
To: eric.dumazet
Cc: oliver, anca.emanuel, piotr, linux-kernel, netdev, romieu,
torvalds
In-Reply-To: <1300549151.2831.32.camel@edumazet-laptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sat, 19 Mar 2011 16:39:11 +0100
> [PATCH] r8169: fix a bug in rtl8169_init_phy()
>
> commit 54405cde7624 (r8169: support control of advertising.)
> introduced a bug in rtl8169_init_phy()
>
> Reported-by: Piotr Hosowicz <piotr@hosowicz.com>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Applied to net-2.6, thanks Eric.
Linus, this is definitely the bug you were seeing too.
> Cc: Oliver Neukum <oliver@neukum.org>
> Cc: Francois Romieu <romieu@fr.zoreil.com>
> ---
> drivers/net/r8169.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
> index 5e40351..493b0de 100644
> --- a/drivers/net/r8169.c
> +++ b/drivers/net/r8169.c
> @@ -2685,9 +2685,9 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp)
> rtl8169_set_speed(dev, AUTONEG_ENABLE, SPEED_1000, DUPLEX_FULL,
> ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |
> ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full |
> - tp->mii.supports_gmii ?
> + (tp->mii.supports_gmii ?
> ADVERTISED_1000baseT_Half |
> - ADVERTISED_1000baseT_Full : 0);
> + ADVERTISED_1000baseT_Full : 0));
>
> if (RTL_R8(PHYstatus) & TBI_Enable)
> netif_info(tp, link, dev, "TBI auto-negotiating\n");
>
>
^ permalink raw reply
* Re: [PATCH] bonding: fix a typo in a comment
From: David Miller @ 2011-03-19 20:36 UTC (permalink / raw)
To: nicolas.2p.debian; +Cc: fubar, andy, netdev
In-Reply-To: <1300541467-6133-1-git-send-email-nicolas.2p.debian@free.fr>
From: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
Date: Sat, 19 Mar 2011 14:31:07 +0100
> Signed-off-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH] r8169: fix a bug in rtl8169_init_phy()
From: Francois Romieu @ 2011-03-19 19:41 UTC (permalink / raw)
To: Oliver Neukum
Cc: Eric Dumazet, Anca Emanuel, piotr, LKML, netdev, David Miller,
Hayes
In-Reply-To: <201103191641.41718.oliver@neukum.org>
Hayes Cced.
Oliver Neukum <oliver@neukum.org> :
[wrong operator priority fixed by Eric]
> Thank you. I feel like banging my head against something.
Spare your walls : I added the test and I was quite satisfied
after testing ... with an always gigabit capable peer :o/
--
Ueimor
^ permalink raw reply
* Re: [PATCH] r8169: fix a bug in rtl8169_init_phy()
From: Piotr Hosowicz @ 2011-03-19 18:59 UTC (permalink / raw)
To: Eric Dumazet
Cc: Oliver Neukum, Anca Emanuel, LKML, netdev, Francois Romieu,
David Miller
In-Reply-To: <1300549151.2831.32.camel@edumazet-laptop>
On 19.03.2011 16:39, Eric Dumazet wrote:
> Le samedi 19 mars 2011 à 16:33 +0100, Eric Dumazet a écrit :
>> Le samedi 19 mars 2011 à 16:31 +0100, Oliver Neukum a écrit :
>>> Am Samstag, 19. März 2011, 16:18:50 schrieb Eric Dumazet:
>>>
>>>> Problem comes from commit 54405cde762408b00a445466a40da4f7f33a8479
>>>> (r8169: support control of advertising.)
>>>>
>>>> Reverting it brings back NIC for me
>>>
>>> Odd. It worked for me. Are you testing on a gigabit switch? Could you send
>>> me dmesg? Does it work if you use ethtool to advertise a lower speed?
>>>
>>> Regards
>>> Oliver
>>
>> I found the bug, I am sending a patch in two minutes.
>>
>
> Here it is
>
> [PATCH] r8169: fix a bug in rtl8169_init_phy()
>
> commit 54405cde7624 (r8169: support control of advertising.)
> introduced a bug in rtl8169_init_phy()
>
> Reported-by: Piotr Hosowicz<piotr@hosowicz.com>
> Signed-off-by: Eric Dumazet<eric.dumazet@gmail.com>
> Cc: Oliver Neukum<oliver@neukum.org>
> Cc: Francois Romieu<romieu@fr.zoreil.com>
Tested-by: Piotr Hosowicz<piotr@hosowicz.com>
Works OK now.
Regards,
Piotr Hosowicz
--
Parafrazując Einsteina: w socjaliźmie są dwa zawody z przy-
szłością: piekarz i urzędnik, chociaż co do pierwszego to
nie mam pewności. (by Kubarek, http://blog.kubarek.info/)
NP: Karmakanic - Send a message from the heart
NB: 2.6.38-20110319-1638-net++
^ permalink raw reply
* Re: [PATCH] r8169: fix a bug in rtl8169_init_phy()
From: Anca Emanuel @ 2011-03-19 17:20 UTC (permalink / raw)
To: Eric Dumazet
Cc: Oliver Neukum, piotr, LKML, netdev, Francois Romieu, David Miller,
Linus Torvalds
In-Reply-To: <1300549151.2831.32.camel@edumazet-laptop>
On Sat, Mar 19, 2011 at 5:39 PM, Eric Dumazet <eric.dumazet@gmail.com> wrote:
> Le samedi 19 mars 2011 à 16:33 +0100, Eric Dumazet a écrit :
>> Le samedi 19 mars 2011 à 16:31 +0100, Oliver Neukum a écrit :
>> > Am Samstag, 19. März 2011, 16:18:50 schrieb Eric Dumazet:
>> >
>> > > Problem comes from commit 54405cde762408b00a445466a40da4f7f33a8479
>> > > (r8169: support control of advertising.)
>> > >
>> > > Reverting it brings back NIC for me
>> >
>> > Odd. It worked for me. Are you testing on a gigabit switch? Could you send
>> > me dmesg? Does it work if you use ethtool to advertise a lower speed?
>> >
>> > Regards
>> > Oliver
>>
>> I found the bug, I am sending a patch in two minutes.
>>
>
> Here it is
>
> [PATCH] r8169: fix a bug in rtl8169_init_phy()
>
> commit 54405cde7624 (r8169: support control of advertising.)
> introduced a bug in rtl8169_init_phy()
>
> Reported-by: Piotr Hosowicz <piotr@hosowicz.com>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> Cc: Oliver Neukum <oliver@neukum.org>
> Cc: Francois Romieu <romieu@fr.zoreil.com>
> ---
> drivers/net/r8169.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
> index 5e40351..493b0de 100644
> --- a/drivers/net/r8169.c
> +++ b/drivers/net/r8169.c
> @@ -2685,9 +2685,9 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp)
> rtl8169_set_speed(dev, AUTONEG_ENABLE, SPEED_1000, DUPLEX_FULL,
> ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |
> ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full |
> - tp->mii.supports_gmii ?
> + (tp->mii.supports_gmii ?
> ADVERTISED_1000baseT_Half |
> - ADVERTISED_1000baseT_Full : 0);
> + ADVERTISED_1000baseT_Full : 0));
>
> if (RTL_R8(PHYstatus) & TBI_Enable)
> netif_info(tp, link, dev, "TBI auto-negotiating\n");
>
>
>
Thanks Eric, It Woks now !
My r8169 was not working see:
https://lkml.org/lkml/2011/3/19/19
Tested-by: Anca Emanuel <anca.emanuel@gmail.com>
^ permalink raw reply
* Re: [PATCH] r8169: fix a bug in rtl8169_init_phy()
From: Piotr Hosowicz @ 2011-03-19 17:03 UTC (permalink / raw)
To: Anca Emanuel
Cc: Eric Dumazet, Oliver Neukum, LKML, netdev, Francois Romieu,
David Miller
In-Reply-To: <AANLkTim9m2A6MXBrx2QHLYNTph9mW9+BUyQpwL5QpjtB@mail.gmail.com>
On 19.03.2011 17:38, Anca Emanuel wrote:
> On Sat, Mar 19, 2011 at 6:27 PM, Piotr Hosowicz<piotr@hosowicz.com> wrote:
>> On 19.03.2011 17:04, Eric Dumazet wrote:
>>>
>>> Le samedi 19 mars 2011 à 16:49 +0100, Piotr Hosowicz a écrit :
>>>
>>>> I do not understand. I reverted the commit you mentioned and am building
>>>> now. Will it suffice?
>>>>
>>>
>>> Either you
>>>
>>> 1) Revert the commit
>>
>> OK. This is what I've done and everything is OK, net works as usual. But
>> what should I do next? Will the revert be done on the GIT server? And when?
>> I try not to clone to much and wastefuly. And am new to GIT so sorry for the
>> question.
>
> Next: Test Eric's patch, and send and email with Tested-by tag.
I just built the kernel with the commit reverted as Eric said in the
beginning and it works. Should I build again with patching in place of
reverting and report it? Is the method same as ordinary patching?
Regards,
Piotr Hosowicz
--
Sygnaturka utworzona wyłącznie ze zrecyklingowanych literek
najwyższej jakości poddanych procesowi starannej selekcji.
NP: Big Big Train - The Underfall Yard
NB: 2.6.38-20110319-1638-net+
^ permalink raw reply
* Re: [PATCH] r8169: fix a bug in rtl8169_init_phy()
From: Eric Dumazet @ 2011-03-19 16:41 UTC (permalink / raw)
To: Anca Emanuel
Cc: piotr, Oliver Neukum, LKML, netdev, Francois Romieu, David Miller
In-Reply-To: <AANLkTim9m2A6MXBrx2QHLYNTph9mW9+BUyQpwL5QpjtB@mail.gmail.com>
Le samedi 19 mars 2011 à 18:38 +0200, Anca Emanuel a écrit :
> Next: Test Eric's patch, and send and email with Tested-by tag.
Well, my patch was actually tested on one of my machines ;)
^ permalink raw reply
* Re: [PATCH] r8169: fix a bug in rtl8169_init_phy()
From: Anca Emanuel @ 2011-03-19 16:38 UTC (permalink / raw)
To: piotr
Cc: Eric Dumazet, Oliver Neukum, LKML, netdev, Francois Romieu,
David Miller
In-Reply-To: <4D84D956.8090407@example.com>
On Sat, Mar 19, 2011 at 6:27 PM, Piotr Hosowicz <piotr@hosowicz.com> wrote:
> On 19.03.2011 17:04, Eric Dumazet wrote:
>>
>> Le samedi 19 mars 2011 à 16:49 +0100, Piotr Hosowicz a écrit :
>>
>>> I do not understand. I reverted the commit you mentioned and am building
>>> now. Will it suffice?
>>>
>>
>> Either you
>>
>> 1) Revert the commit
>
> OK. This is what I've done and everything is OK, net works as usual. But
> what should I do next? Will the revert be done on the GIT server? And when?
> I try not to clone to much and wastefuly. And am new to GIT so sorry for the
> question.
Next: Test Eric's patch, and send and email with Tested-by tag.
^ permalink raw reply
* Re: [PATCH] r8169: fix a bug in rtl8169_init_phy()
From: Piotr Hosowicz @ 2011-03-19 16:27 UTC (permalink / raw)
To: Eric Dumazet
Cc: Oliver Neukum, Anca Emanuel, LKML, netdev, Francois Romieu,
David Miller
In-Reply-To: <1300550653.2831.34.camel@edumazet-laptop>
On 19.03.2011 17:04, Eric Dumazet wrote:
> Le samedi 19 mars 2011 à 16:49 +0100, Piotr Hosowicz a écrit :
>
>> I do not understand. I reverted the commit you mentioned and am building
>> now. Will it suffice?
>>
>
> Either you
>
> 1) Revert the commit
OK. This is what I've done and everything is OK, net works as usual. But
what should I do next? Will the revert be done on the GIT server? And
when? I try not to clone to much and wastefuly. And am new to GIT so
sorry for the question.
>
> OR
>
> 2) apply my patch
Regards and thanks,
Piotr Hosowicz
--
Jest jedna korzyść z posiadania TV - jak dobrze
rozregulujesz odbiornik, trafisz na promieniowanie
mikrofalowe z początków Wszechświata.
NP: Big Big Train - Master James Of St George
NB: 2.6.38-20110319-1638-net+
^ permalink raw reply
* Re: [PATCH] net: drop NETIF_F_GSO from hw_features without NETIF_F_SG
From: Michał Mirosław @ 2011-03-19 16:18 UTC (permalink / raw)
To: Roger Luethi; +Cc: netdev
In-Reply-To: <20110319074653.GA12820@core.hellgate.ch>
2011/3/19 Roger Luethi <rl@hellgate.ch>:
> On Fri, 18 Mar 2011 21:43:23 +0100, Micha? Miros?aw wrote:
>> 2011/3/18 Roger Luethi <rl@hellgate.ch>:
>> > register_netdevice() removes NETIF_F_GSO from dev->features and
>> > dev->wanted_features for hardware without NETIF_F_SG to "avoid warning from
>> > netdev_fix_features()".
>> >
>> > However, as the flag remains set in dev->hw_features, users trying to
>> > enable GSO via ethtool will still end up with NETIF_F_GSO stuck in
>> > wanted_features, resulting in a warning every time they try to change any
>> > feature (until they use ethtool to "disable" GSO):
>>
>> That's expected, as it allows the user to debug why his request didn't
>> work as expected. I think that those messages should get demoted to
>> DEBUG if that's too noisy. The network core imposed conditions could
>> be explained in Documentation/ or ethtool manpage instead.
>
> I agree that it is good to have a note explaining what happened in the
> kernel log, and the patch I posted does not do that; that is easy to fix.
>
> However, I still think the current, unpatched behavior is confusing users.
> ethtool_get_features() will happily tell the user that GSO is available for
> a NIC even if it is not (because the NIC does not support SG). Then, if the
> user tries to enable GSO, the operation fails silently: ethtool won't get
> an error code, so it looks as if the operation succeeded. The user needs to
> look into the kernel log or actually verify the offload settings to realize
> that something went wrong.
Actually, the user will get the information that GSO wasn't enabled,
though not while using ETHTOOL_SGSO.
OTOH, I think I can see what's your point - I got confused by your
proposed patch. The correct way is to remove NETIF_F_GSO from
hw_features when NETIF_F_SG is not present in hw_features (and not
wanted_features as you're patch is doing). The idea here is that a
driver might advertise SG in changeable features (that's hw_features)
but not enable it by default for whatever reason.
Do you want to prepare a patch for this? Please remember about
compatibility with per-offload ethtool ops if you do - this needs to
be there until all drivers are converted to hw_features.
Best Regards,
Michał Mirosław
^ permalink raw reply
* Re: [PATCH] r8169: fix a bug in rtl8169_init_phy()
From: Piotr Hosowicz @ 2011-03-19 15:49 UTC (permalink / raw)
To: Eric Dumazet
Cc: Oliver Neukum, Anca Emanuel, LKML, netdev, Francois Romieu,
David Miller
In-Reply-To: <1300549151.2831.32.camel@edumazet-laptop>
On 19.03.2011 16:39, Eric Dumazet wrote:
> Le samedi 19 mars 2011 à 16:33 +0100, Eric Dumazet a écrit :
>> Le samedi 19 mars 2011 à 16:31 +0100, Oliver Neukum a écrit :
>>> Am Samstag, 19. März 2011, 16:18:50 schrieb Eric Dumazet:
>>>
>>>> Problem comes from commit 54405cde762408b00a445466a40da4f7f33a8479
>>>> (r8169: support control of advertising.)
>>>>
>>>> Reverting it brings back NIC for me
>>>
>>> Odd. It worked for me. Are you testing on a gigabit switch? Could you send
>>> me dmesg? Does it work if you use ethtool to advertise a lower speed?
>>>
>>> Regards
>>> Oliver
>>
>> I found the bug, I am sending a patch in two minutes.
I do not understand. I reverted the commit you mentioned and am building
now. Will it suffice?
Regards,
Piotr Hosowicz
--
TV: "W tej chwili, że się tak wyrażę, zaliczonych mamy 17 zawodniczek."
NP: Big Big Train - Victorian Brickwork
NB: 2.6.38-git3
^ permalink raw reply
* Re: [PATCH] r8169: fix a bug in rtl8169_init_phy()
From: Piotr Hosowicz @ 2011-03-19 16:03 UTC (permalink / raw)
To: Eric Dumazet
Cc: Oliver Neukum, Anca Emanuel, LKML, netdev, Francois Romieu,
David Miller
In-Reply-To: <1300549151.2831.32.camel@edumazet-laptop>
On 19.03.2011 16:39, Eric Dumazet wrote:
> Le samedi 19 mars 2011 à 16:33 +0100, Eric Dumazet a écrit :
>> Le samedi 19 mars 2011 à 16:31 +0100, Oliver Neukum a écrit :
>>> Am Samstag, 19. März 2011, 16:18:50 schrieb Eric Dumazet:
>>>
>>>> Problem comes from commit 54405cde762408b00a445466a40da4f7f33a8479
>>>> (r8169: support control of advertising.)
>>>>
>>>> Reverting it brings back NIC for me
>>>
>>> Odd. It worked for me. Are you testing on a gigabit switch? Could you send
>>> me dmesg? Does it work if you use ethtool to advertise a lower speed?
>>>
>>> Regards
>>> Oliver
>>
>> I found the bug, I am sending a patch in two minutes.
I do not understand. I reverted the commit you mentioned and am building
now. Will it suffice?
Regards,
Piotr Hosowicz
--
TV: "W tej chwili, że się tak wyrażę, zaliczonych mamy 17 zawodniczek."
NP: Big Big Train - Victorian Brickwork
NB: 2.6.38-git3
^ permalink raw reply
* Re: [PATCH] r8169: fix a bug in rtl8169_init_phy()
From: Eric Dumazet @ 2011-03-19 16:04 UTC (permalink / raw)
To: piotr
Cc: Oliver Neukum, Anca Emanuel, LKML, netdev, Francois Romieu,
David Miller
In-Reply-To: <4D84D098.1050802@example.com>
Le samedi 19 mars 2011 à 16:49 +0100, Piotr Hosowicz a écrit :
> I do not understand. I reverted the commit you mentioned and am building
> now. Will it suffice?
>
Either you
1) Revert the commit
OR
2) apply my patch
;)
^ permalink raw reply
* Re: [PATCH] r8169: fix a bug in rtl8169_init_phy()
From: Piotr Hosowicz @ 2011-03-19 15:52 UTC (permalink / raw)
To: Oliver Neukum
Cc: Eric Dumazet, Anca Emanuel, LKML, netdev, Francois Romieu,
David Miller
In-Reply-To: <201103191641.41718.oliver@neukum.org>
On 19.03.2011 16:41, Oliver Neukum wrote:
> Am Samstag, 19. März 2011, 16:39:11 schrieben Sie:
>> Le samedi 19 mars 2011 à 16:33 +0100, Eric Dumazet a écrit :
>>> Le samedi 19 mars 2011 à 16:31 +0100, Oliver Neukum a écrit :
>>>> Am Samstag, 19. März 2011, 16:18:50 schrieb Eric Dumazet:
>>>>
>>>>> Problem comes from commit 54405cde762408b00a445466a40da4f7f33a8479
>>>>> (r8169: support control of advertising.)
>>>>>
>>>>> Reverting it brings back NIC for me
>>>>
>>>> Odd. It worked for me. Are you testing on a gigabit switch? Could you send
>>>> me dmesg? Does it work if you use ethtool to advertise a lower speed?
>>>>
>>>> Regards
>>>> Oliver
>>>
>>> I found the bug, I am sending a patch in two minutes.
>>>
>>
>> Here it is
>>
>> [PATCH] r8169: fix a bug in rtl8169_init_phy()
>>
>> commit 54405cde7624 (r8169: support control of advertising.)
>> introduced a bug in rtl8169_init_phy()
>
> Thank you. I feel like banging my head against something.
If it will work I will be banging against the wall. I am missing for a
fresh new kernel with networking.
--
Szef TVN24 do dziennikarzy: Kochani, przez dwa lata waliliśmy w obóz
rządzący. Tak dalej byc nie może. Jesteśmy telewizją niezależną i to
zobowiązuje. Teraz będziemy kopać w opozycję.
NP: Big Big Train - Victorian Brickwork
NB: 2.6.38-git3
^ permalink raw reply
* Re: [PATCHv2 3/9] macb: unify at91 and avr32 platform data
From: Nicolas Ferre @ 2011-03-19 15:49 UTC (permalink / raw)
To: Russell King - ARM Linux, Jamie Iles, Peter Korsgaard,
avictor.za@gmail.com, plagnioj
Cc: linux-arm-kernel, netdev
In-Reply-To: <20110318155428.GA22087@n2100.arm.linux.org.uk>
On 3/18/2011 11:54 PM, Russell King - ARM Linux :
> On Fri, Mar 18, 2011 at 03:48:39PM +0000, Jamie Iles wrote:
>> On Fri, Mar 18, 2011 at 03:41:18PM +0000, Russell King - ARM Linux wrote:
>>> On Thu, Mar 17, 2011 at 09:51:01PM +0000, Jamie Iles wrote:
>>>> On Thu, Mar 17, 2011 at 09:34:03AM +0000, Jamie Iles wrote:
>>>>> Ok, I'll rename to macb_platform_data and update at91_ether to use
>>>>> that with a comment describing that we're sharing the platform data
>>>>> with macb. At least that gets rid of the preprocessor stuff in
>>>>> board.h for at91 too.
>>>>
>>>> So here's the updated patch with changes to the at91_ether driver to
>>>> share the data with macb.
>>>>
>>>> Russell, are you happy to take this series? If so, how would you prefer
>>>> it, in the patch system or as a git pull?
>>>
>>> As Nicolas Ferre is listed in MAINTAINERS as being responsible for the
>>> MACB driver, I think he should at last Ack these patches first.
>>
>> OK, that's absolutely fine with me.
>>
>>> I'm also concious of the fact that Linus complains if my tree contains
>>> changes for drivers/ stuff as well as ARM stuff, so I'm nervous about
>>> taking it as-is. So, I'd rather see drivers stuff separated as much
>>> as possible from the arch updates.
>>
>> I happy to split the driver and arch updates, but I'm not sure that it
>> can be done in such a way that platforms would build between the arch
>> and driver merges.
>>
>>> I'm also concious that this has become ready for potentially merging
>>> during the merge window, and therefore hasn't had previous exposure
>>> in linux-next, and so should wait until the next merge window. I do
>>> feel that I'm going to be yelled at for saying that... but I'm sure
>>> I'll also be yelled at if I did take it.
>>
>> I don't have any problem with waiting until the next merge window, and
>> to be honest I'd like see these patches have some time in next as I
>> can't test them on devices with a MACB.
>
> Okay, that sounds like a very good reason to wait until Nicolas can
> review them and provide an ack.
Be sure that I am silently following this series in the background (too
silently ? ;-) ). I will provide an ack after a last review and testing
but as you have all fruitfully discussed main aspects I am very happy
with the way it is going.
Thanks to all of you, best regards,
--
Nicolas Ferre
^ permalink raw reply
* Re: [PATCH] r8169: fix a bug in rtl8169_init_phy()
From: Eric Dumazet @ 2011-03-19 15:44 UTC (permalink / raw)
To: Oliver Neukum
Cc: Anca Emanuel, piotr, LKML, netdev, Francois Romieu, David Miller
In-Reply-To: <201103191641.41718.oliver@neukum.org>
Le samedi 19 mars 2011 à 16:41 +0100, Oliver Neukum a écrit :
> Thank you. I feel like banging my head against something.
>
Well, it happens, dont worry ;)
^ permalink raw reply
* Re: [PATCH] r8169: fix a bug in rtl8169_init_phy()
From: Oliver Neukum @ 2011-03-19 15:41 UTC (permalink / raw)
To: Eric Dumazet
Cc: Anca Emanuel, piotr, LKML, netdev, Francois Romieu, David Miller
In-Reply-To: <1300549151.2831.32.camel@edumazet-laptop>
Am Samstag, 19. März 2011, 16:39:11 schrieben Sie:
> Le samedi 19 mars 2011 à 16:33 +0100, Eric Dumazet a écrit :
> > Le samedi 19 mars 2011 à 16:31 +0100, Oliver Neukum a écrit :
> > > Am Samstag, 19. März 2011, 16:18:50 schrieb Eric Dumazet:
> > >
> > > > Problem comes from commit 54405cde762408b00a445466a40da4f7f33a8479
> > > > (r8169: support control of advertising.)
> > > >
> > > > Reverting it brings back NIC for me
> > >
> > > Odd. It worked for me. Are you testing on a gigabit switch? Could you send
> > > me dmesg? Does it work if you use ethtool to advertise a lower speed?
> > >
> > > Regards
> > > Oliver
> >
> > I found the bug, I am sending a patch in two minutes.
> >
>
> Here it is
>
> [PATCH] r8169: fix a bug in rtl8169_init_phy()
>
> commit 54405cde7624 (r8169: support control of advertising.)
> introduced a bug in rtl8169_init_phy()
Thank you. I feel like banging my head against something.
Regards
Oliver
^ permalink raw reply
* [PATCH] r8169: fix a bug in rtl8169_init_phy()
From: Eric Dumazet @ 2011-03-19 15:39 UTC (permalink / raw)
To: Oliver Neukum
Cc: Anca Emanuel, piotr, LKML, netdev, Francois Romieu, David Miller
In-Reply-To: <1300548821.2831.28.camel@edumazet-laptop>
Le samedi 19 mars 2011 à 16:33 +0100, Eric Dumazet a écrit :
> Le samedi 19 mars 2011 à 16:31 +0100, Oliver Neukum a écrit :
> > Am Samstag, 19. März 2011, 16:18:50 schrieb Eric Dumazet:
> >
> > > Problem comes from commit 54405cde762408b00a445466a40da4f7f33a8479
> > > (r8169: support control of advertising.)
> > >
> > > Reverting it brings back NIC for me
> >
> > Odd. It worked for me. Are you testing on a gigabit switch? Could you send
> > me dmesg? Does it work if you use ethtool to advertise a lower speed?
> >
> > Regards
> > Oliver
>
> I found the bug, I am sending a patch in two minutes.
>
Here it is
[PATCH] r8169: fix a bug in rtl8169_init_phy()
commit 54405cde7624 (r8169: support control of advertising.)
introduced a bug in rtl8169_init_phy()
Reported-by: Piotr Hosowicz <piotr@hosowicz.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Oliver Neukum <oliver@neukum.org>
Cc: Francois Romieu <romieu@fr.zoreil.com>
---
drivers/net/r8169.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 5e40351..493b0de 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2685,9 +2685,9 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp)
rtl8169_set_speed(dev, AUTONEG_ENABLE, SPEED_1000, DUPLEX_FULL,
ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |
ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full |
- tp->mii.supports_gmii ?
+ (tp->mii.supports_gmii ?
ADVERTISED_1000baseT_Half |
- ADVERTISED_1000baseT_Full : 0);
+ ADVERTISED_1000baseT_Full : 0));
if (RTL_R8(PHYstatus) & TBI_Enable)
netif_info(tp, link, dev, "TBI auto-negotiating\n");
^ permalink raw reply related
* Re: No networking since git3
From: Eric Dumazet @ 2011-03-19 15:33 UTC (permalink / raw)
To: Oliver Neukum
Cc: Anca Emanuel, piotr, LKML, netdev, Francois Romieu, David Miller
In-Reply-To: <201103191631.07952.oliver@neukum.org>
Le samedi 19 mars 2011 à 16:31 +0100, Oliver Neukum a écrit :
> Am Samstag, 19. März 2011, 16:18:50 schrieb Eric Dumazet:
>
> > Problem comes from commit 54405cde762408b00a445466a40da4f7f33a8479
> > (r8169: support control of advertising.)
> >
> > Reverting it brings back NIC for me
>
> Odd. It worked for me. Are you testing on a gigabit switch? Could you send
> me dmesg? Does it work if you use ethtool to advertise a lower speed?
>
> Regards
> Oliver
I found the bug, I am sending a patch in two minutes.
^ permalink raw reply
* Re: No networking since git3
From: Oliver Neukum @ 2011-03-19 15:31 UTC (permalink / raw)
To: Eric Dumazet
Cc: Anca Emanuel, piotr, LKML, netdev, Francois Romieu, David Miller
In-Reply-To: <1300547930.2831.27.camel@edumazet-laptop>
Am Samstag, 19. März 2011, 16:18:50 schrieb Eric Dumazet:
> Problem comes from commit 54405cde762408b00a445466a40da4f7f33a8479
> (r8169: support control of advertising.)
>
> Reverting it brings back NIC for me
Odd. It worked for me. Are you testing on a gigabit switch? Could you send
me dmesg? Does it work if you use ethtool to advertise a lower speed?
Regards
Oliver
^ permalink raw reply
* Re: No networking since git3
From: Eric Dumazet @ 2011-03-19 15:18 UTC (permalink / raw)
To: Anca Emanuel
Cc: piotr, LKML, netdev, Francois Romieu, David Miller, Oliver Neukum
In-Reply-To: <AANLkTimFGeHYEOxx=h883rRJL463g1CBUDS0wGM-52Nj@mail.gmail.com>
Le samedi 19 mars 2011 à 16:08 +0200, Anca Emanuel a écrit :
> 2011/3/19 Piotr Hosowicz <piotr@hosowicz.com>:
> > On 19.03.2011 13:56, Anca Emanuel wrote:
> >>
> >> 2011/3/19 Piotr Hosowicz<piotr@hosowicz.com>:
> >>>
> >>> Hello,
> >>>
> >>> I wrote lately, the problem persists, that's why I write again. I tested
> >>> git7 just now and it still does not work.
> >>
> >> Same problem here:
> >>
> >> [ 12.923685] r8169 0000:04:00.0: eth0: link down
> >> [ 12.923941] ADDRCONF(NETDEV_UP): eth0: link is not ready
> >>
> >> dmesg attached.
> >
> > Nice to hear that I am not the only person with this problem. I forgot about
> > the dmesg.
> >
> > Regards,
> >
> > Piotr Hosowicz
>
> Added CCs
Hi
Problem comes from commit 54405cde762408b00a445466a40da4f7f33a8479
(r8169: support control of advertising.)
Reverting it brings back NIC for me
^ permalink raw reply
* Re: No networking since git3
From: Anca Emanuel @ 2011-03-19 14:08 UTC (permalink / raw)
To: piotr; +Cc: LKML, netdev, Francois Romieu, David Miller
In-Reply-To: <4D84A9F6.8080402@example.com>
2011/3/19 Piotr Hosowicz <piotr@hosowicz.com>:
> On 19.03.2011 13:56, Anca Emanuel wrote:
>>
>> 2011/3/19 Piotr Hosowicz<piotr@hosowicz.com>:
>>>
>>> Hello,
>>>
>>> I wrote lately, the problem persists, that's why I write again. I tested
>>> git7 just now and it still does not work.
>>
>> Same problem here:
>>
>> [ 12.923685] r8169 0000:04:00.0: eth0: link down
>> [ 12.923941] ADDRCONF(NETDEV_UP): eth0: link is not ready
>>
>> dmesg attached.
>
> Nice to hear that I am not the only person with this problem. I forgot about
> the dmesg.
>
> Regards,
>
> Piotr Hosowicz
Added CCs
^ 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