Commits · c44a4366649aca4f5b4a51ff71d4c9cde3b7c9da · linux / linux-davinci

28 Mar, 2009 2 commits

Revert "ax25: zero length frame filtering in AX25" · c44a4366

David S. Miller authored Mar 27, 2009

This reverts commit f99bcff7.

Like netrom, Alan Cox says that zero lengths have real meaning
and are useful in this protocol.
Signed-off-by: David S. Miller <davem@davemloft.net>

c44a4366

Revert "netrom: zero length frame filtering in NetRom" · 80e20f6f

David S. Miller authored Mar 27, 2009

This reverts commit a3ac80a1.

Alan Cox says that zero length writes do have special meaning
and are useful in this protocol.
Signed-off-by: David S. Miller <davem@davemloft.net>

80e20f6f

27 Mar, 2009 38 commits

ucc_geth: Fix three oopses in PHY {de,}initialization code · 79675900

Anton Vorontsov authored Mar 27, 2009

When there are no free snums, UCC ethernet should gracefully fail, but
currently it oopses this way:

  # ifconfig eth0 up
  fill_init_enet_entries: Can not get SNUM.
  ucc_geth_startup: Can not fill p_init_enet_param_shadow.
  eth0: Cannot configure net device, aborting.
  Unable to handle kernel paging request for data at address 0x00000190
  Faulting instruction address: 0xc0294c88
  Oops: Kernel access of bad area, sig: 11 [#1]
  [...]
  NIP [c0294c88] mutex_lock+0x0/0x1c
  LR [c01b6be8] phy_stop+0x20/0x70
  Call Trace:
  [efb25da0] [efb2eb60] 0xefb2eb60 (unreliable)
  [efb25db0] [c01b2058] ucc_geth_stop+0x2c/0x8c
  [efb25dd0] [c01b4194] ucc_geth_open+0x48/0x27c
  [efb25df0] [c020eec0] dev_open+0xc0/0x118
  [...]

This is because the ucc_geth_stop() routine assumes that ugeth->phydev
is always initialized by the ucc_geth_open(), while it is not in case
of errors.

If we add a check to the ucc_geth_stop(), then another oops pops up:

  Unable to handle kernel paging request for data at address 0x00000004
  Faulting instruction address: 0xc01b46a4
  Oops: Kernel access of bad area, sig: 11 [#1]
  [...]
  NIP [c01b46a4] adjust_link+0x20/0x1b4
  LR [c01b770c] phy_state_machine+0xdc/0x44c
  Call Trace:
  [ef83bf10] [c021b388] linkwatch_schedule_work+0x74/0xf8 (unreliable)
  [ef83bf40] [c01b770c] phy_state_machine+0xdc/0x44c
  [ef83bf60] [c004c13c] run_workqueue+0xb8/0x148
  [ef83bf90] [c004c870] worker_thread+0x70/0xd0
  [ef83bfd0] [c00505fc] kthread+0x48/0x84
  [ef83bff0] [c000f464] kernel_thread+0x4c/0x68
  [...]

That one happens because ucc_geth_stop() does not call phy_disconnect()
and so phylib state machine is running without any idea that a MAC has
just died.

Also, when device tree specifies fixed-link, and CONFIG_FIXED_PHY
is disabled, we'll get this oops:

  0:01 not found
  eth2: Could not attach to PHY
  eth2: Cannot initialize PHY, aborting.
  Unable to handle kernel paging request for data at address 0x00000190
  Faulting instruction address: 0xc02967d0
  Oops: Kernel access of bad area, sig: 11 [#1]
  [...]
  NIP [c02967d0] mutex_lock+0x0/0x1c
  LR [c01b6bcc] phy_stop+0x20/0x70
  Call Trace:
  [ef82be50] [efb6bb60] 0xefb6bb60 (unreliable)
  [ef82be60] [c01b2058] ucc_geth_stop+0x2c/0x8c
  [ef82be80] [c01b4194] ucc_geth_open+0x48/0x27c
  [ef82bea0] [c0210a04] dev_open+0xc0/0x118
  [ef82bec0] [c020f85c] dev_change_flags+0x84/0x1ac
  [ef82bee0] [c037b768] ic_open_devs+0x168/0x2bc
  [ef82bf20] [c037ca98] ip_auto_config+0x90/0x28c
  [ef82bf60] [c0001b9c] do_one_initcall+0x34/0x1a0
  [ef82bfd0] [c035e240] do_initcalls+0x38/0x58
  [ef82bfe0] [c035e2c4] kernel_init+0x30/0x90
  [ef82bff0] [c000f464] kernel_thread+0x4c/0x68
  [...]

And again, ucc_geth_stop() assumes that ugeth->phydev is there, while
it isn't.

This patch fixes all three oopses simply by rearranging some code:

- In ucc_geth_open(): move init_phy() call to the beginning, so
  that we only call ucc_geth_stop() with a PHY attached;
- Move phy_disconnect() call from ucc_geth_close() to
  ucc_geth_stop(), so that we'll always disconnect the PHY.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

79675900

net: Add missing include into include/linux/netdevice.h · cc0be322

Dmitri Vorobiev authored Mar 27, 2009

The inline function skb_gro_mac_header defined in include/linux/netdevice.h
makes use of page_address(). Depending on configuration options, the latter
is either defined as a macro or is declared as a function in another header
file, namely include/linux/mm.h. However, include/linux/netdevice.h does not
include include/linux/mm.h.

On MIPS, this has produced the following build error:

  CC      kernel/sysctl_check.o
In file included from include/linux/icmpv6.h:173,
                 from include/linux/ipv6.h:208,
                 from include/net/ip_vs.h:26,
                 from kernel/sysctl_check.c:6:
include/linux/netdevice.h: In function 'skb_gro_mac_header':
include/linux/netdevice.h:1132: error: implicit declaration of function
'page_address'
include/linux/netdevice.h:1133: warning: pointer/integer type mismatch
in conditional expression
make[1]: *** [kernel/sysctl_check.o] Error 1
make: *** [kernel] Error 2

The patch adds the missing include and fixes the build error.
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@movial.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

cc0be322

gianfar: only check headroom when FCB is needed · 5b28beaf

Li Yang authored Mar 27, 2009

Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

5b28beaf

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ · 8ebaebca
David S. Miller authored Mar 27, 2009

8ebaebca
gianfar: Fix kfree(skb) · bd14ba84
David S. Miller authored Mar 27, 2009
```
Noticed by Li Yang.
Signed-off-by: David S. Miller <davem@davemloft.net>
```
bd14ba84

cxgb3: map entire Rx page, feed map+offset to Rx ring. · 5e68b772

Divy Le Ray authored Mar 26, 2009

DMA mapping can be expensive in the presence of iommus.
Reduce the Rx iommu activity by mapping an entire page, and provide the H/W
the mapped address + offset of the current page chunk.
Reserve bits at the end of the page to track mapping references, so the page
can be unmapped.
Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

5e68b772

cxgb3: differentiate portx and Tx channels · 952cdf33

Divy Le Ray authored Mar 26, 2009

Separate ports from H/W Tx channels.
Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

952cdf33

cxgb3: use resource_size_t for mmio declarations · 68f40c10

Divy Le Ray authored Mar 26, 2009

Use resource_size_t to declare mmio start and len variables.
Print PEX error register after EEH resumed.
Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

68f40c10

cxgb3: sge setup fixes · 3fa58c88

Divy Le Ray authored Mar 26, 2009

Enable timestamps, update delayed ack threshold for iSCSI/iWARP traffic
Remove the len flag in Tx requests. It might corrupt offload trace packets.
Update SGE context setup to avoid potential H/W misprogrammation.
Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3fa58c88

cxgb3: start qset timers when setup succeeded · 31563789

Divy Le Ray authored Mar 26, 2009

Start queue set reclaim timers after the queue sets have been
allocated successfully.
Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

31563789

netdev: convert eth16i to net_device_ops · 6d1ec781

Stephen Hemminger authored Mar 26, 2009

Also, get rid of unnecessary memset.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

6d1ec781

netdev: convert cs89x0 to net_device_ops · 15d23e7a

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

15d23e7a

netdev: convert lp486e to net_device_ops · 635d8ba2

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

635d8ba2

netdev: convert ac3200 to net_device_ops · 1494f2f5

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1494f2f5

netdev: convert ni65 to net_device_ops · c6bca821

Stephen Hemminger authored Mar 26, 2009

Also, use internal net_device_stats.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

c6bca821

netdev: convert ni52 to net_device_ops · 2c7669e3

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2c7669e3

netdev: convert ewrk3 to net_device_ops · 968804d9

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

968804d9

netdev: convert depca to net_device_ops · 361bc03e

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

361bc03e

netdev: convert at1700 to net_device_ops · cb0c7005

Stephen Hemminger authored Mar 26, 2009

Remove unneeded memset (alloc_etherdev does it already).
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

cb0c7005

netdev: convert eexpro to net_device_ops · 8afb1ceb

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

8afb1ceb

netdev: convert eexpress to net_device_ops · 8a5f7daf

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

8a5f7daf

netdev: ibmlana convert to net_device_ops · d9c6d50d

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

d9c6d50d

lance: convert to net_device_ops · 462540bd

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

462540bd

netdev: smc-ultra fix netpoll · 06e88403

Stephen Hemminger authored Mar 26, 2009

net_device_ops conversion left the wrong poll_controller hook.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

06e88403

netdev: smc-ultra32 convert to net_device_ops · 5f352f9a

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

5f352f9a

netdev: smc9194 convert to net_device_ops · 32670c36

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

32670c36

netdev: seeq8005 convert to net_device_ops · b20417db

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

b20417db

wireless: convert wavelan to net_device_ops · 0687478a

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

0687478a

wireless: convert arlan to net_device_ops · 8fdcf1ab

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

8fdcf1ab

wan: convert sdla driver to net_device_ops · ac99533f

Stephen Hemminger authored Mar 26, 2009

Also use internal net_device_stats
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

ac99533f

tokenring: convert smctr to net_device_ops · f70d5949

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

f70d5949

tokenring: convert drivers to net_device_ops · 79f8ae3a

Stephen Hemminger authored Mar 26, 2009

Convert madge and proteon drivers which are really just subclasses
of tms380.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

79f8ae3a

IRDA: convert donauboe to net_device_ops · ddec2c89

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

ddec2c89

appletalk: convert LTPC to net_device_ops · 816b26f5

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

816b26f5

appletalk: convert LTPC to use internal net_device_stats · 4fafc123

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

4fafc123

appltetalk: convert cops device to net_device ops · c2839d43

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

c2839d43

appletalk: convert cops to internal net_device_stats · 8bbce3f6

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

8bbce3f6

uml: convert network device to netdevice ops · 8bb95b39

Stephen Hemminger authored Mar 26, 2009

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

8bb95b39