forcedeth: Revert to the working v3.0 driver
commit3dc26eb6c1731aad36fe9d74f6547de46012ccdc
authorIngo Molnar <mingo@elte.hu>
Fri, 5 Aug 2011 10:16:25 +0000 (5 12:16 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 5 Aug 2011 10:18:36 +0000 (5 12:18 +0200)
tree01b981f77fdef12330597bbc5a7cec446ff5980f
parent3b5a969283da22d67b9e485492a183ad910052ed
forcedeth: Revert to the working v3.0 driver

> >  0891b0e08937: forcedeth: fix vlans
>
> Hm, forcedeth is still giving me trouble even on latest -git
> that has the above fix included.
>
> The symptom is a stuck interface, no packets in. There's a
> frame error RX packet:
>
>  [root@mercury ~]# ifconfig eth0
>  eth0      Link encap:Ethernet  HWaddr 00:13:D4:DC:41:12
>            inet addr:10.0.1.13  Bcast:10.0.1.255 Mask:255.255.255.0
>            UP BROADCAST RUNNING MULTICAST MTU:1500  Metric:1
>            RX packets:0 errors:1 dropped:0 overruns:0 frame:1
>            TX packets:531 errors:0 dropped:0 overruns:0 carrier:0
>            collisions:0 txqueuelen:1000
>            RX bytes:0 (0.0 b)  TX bytes:34112 (33.3 KiB)
>            Interrupt:35
>
> Weirdly enough a defconfig x86 bootup works just fine - it's
> certain  .config combinations that trigger the bug.

I have reverted the two forcedeth commits:

  0891b0e08937: forcedeth: fix vlans
  3326c784c9f4: forcedeth: do vlan cleanup

and also reverted two vlan commits that the pre-cleanup driver
depended on:

  ffcf9b767293: vlan: kill vlan_gro_frags and vlan_gro_receive
  7890a5b9cbfd: vlan: kill ndo_vlan_rx_register

and this finally gave me a working forcedeth driver.

Cc: torvalds@linux-foundation.org
Cc: David Miller <davem@davemloft.net>
Cc: Jiri Pirko <jpirko@redhat.com>
Link: http://lkml.kernel.org/r/20110805101625.GA11502@elte.hu
Signed-off-by: Ingo Molnar <mingo@elte.hu>
drivers/net/forcedeth.c
include/linux/if_vlan.h
include/linux/netdevice.h
net/8021q/vlan.c
net/8021q/vlan_core.c