linux-toradex.git/drivers/net/ethernet, branch v3.6.1

netdev: octeon: fix return value check in octeon_mgmt_init_phy()

2012-09-28T05:18:32+00:00

In case of error, the function of_phy_connect() returns NULL
pointer not ERR_PTR(). The IS_ERR() test in the return value
check should be replaced with NULL test.

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun 
Signed-off-by: David S. Miller

qlcnic: Fix scheduling while atomic bug

2012-09-27T23:24:52+00:00

In the device close path, 'qlcnic_fw_destroy_ctx' and
'qlcnic_poll_rsp' call msleep. But  'qlcnic_fw_destroy_ctx' and
'qlcnic_poll_rsp' are called with 'adapter->tx_clean_lock' spin lock
held resulting in scheduling while atomic bug causing the following
trace.

I observed that the commit 012dc19a45b2b9cc2ebd14aaa401cf782c2abba4
from John Fastabend addresses a similar issue in ixgbevf driver.
Adopting the same approach used in the commit, this patch uses mdelay
to address the issue.

[79884.999115] BUG: scheduling while atomic: ip/30846/0x00000002
[79885.005562] INFO: lockdep is turned off.
[79885.009958] Modules linked in: qlcnic fuse nf_conntrack_netbios_ns nf_conntrack_broadcast ipt_MASQUERADE bnep bluetooth rfkill ip6table_mangle ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 ip6table_filter ip6_tables iptable_nat nf_nat iptable_mangle ipt_REJECT nf_conntrack_ipv4 nf_defrag_ipv4 xt_conntrack nf_conntrack iptable_filter ip_tables dcdbas coretemp kvm_intel kvm iTCO_wdt ixgbe iTCO_vendor_support crc32c_intel ghash_clmulni_intel nfsd microcode sb_edac pcspkr edac_core dca bnx2x shpchp auth_rpcgss nfs_acl lpc_ich mfd_core mdio lockd libcrc32c wmi acpi_pad acpi_power_meter sunrpc uinput sd_mod sr_mod cdrom crc_t10dif ahci libahci libata megaraid_sas usb_storage dm_mirror dm_region_hash dm_log dm_mod [last unloaded: qlcnic]
[79885.083608] Pid: 30846, comm: ip Tainted: G        W  O 3.6.0-rc7+ #1
[79885.090805] Call Trace:
[79885.093569]  [] __schedule_bug+0x68/0x76
[79885.099699]  [] __schedule+0x99e/0xa00
[79885.105634]  [] schedule+0x29/0x70
[79885.111186]  [] schedule_timeout+0x16f/0x350
[79885.117724]  [] ? init_object+0x4a/0x90
[79885.123770]  [] ? __internal_add_timer+0x140/0x140
[79885.130873]  [] schedule_timeout_uninterruptible+0x1e/0x20
[79885.138773]  [] msleep+0x20/0x30
[79885.144159]  [] qlcnic_issue_cmd+0xef/0x290 [qlcnic]
[79885.151478]  [] qlcnic_fw_cmd_destroy_rx_ctx+0x55/0x90 [qlcnic]
[79885.159868]  [] qlcnic_fw_destroy_ctx+0x2d/0xa0 [qlcnic]
[79885.167576]  [] __qlcnic_down+0x11d/0x180 [qlcnic]
[79885.174708]  [] qlcnic_close+0x18/0x20 [qlcnic]
[79885.181547]  [] __dev_close_many+0x95/0xe0
[79885.187899]  [] __dev_close+0x38/0x50
[79885.193761]  [] __dev_change_flags+0xa1/0x180
[79885.200419]  [] dev_change_flags+0x28/0x70
[79885.206779]  [] do_setlink+0x378/0xa00
[79885.212731]  [] ? nla_parse+0x31/0xe0
[79885.218612]  [] rtnl_newlink+0x37e/0x560
[79885.224768]  [] ? selinux_capable+0x39/0x50
[79885.231217]  [] ? security_capable+0x18/0x20
[79885.237765]  [] rtnetlink_rcv_msg+0x114/0x2f0
[79885.244412]  [] ? rtnl_lock+0x17/0x20
[79885.250280]  [] ? rtnl_lock+0x17/0x20
[79885.256148]  [] ? __rtnl_unlock+0x20/0x20
[79885.262413]  [] netlink_rcv_skb+0xa1/0xb0
[79885.268661]  [] rtnetlink_rcv+0x25/0x40
[79885.274727]  [] netlink_unicast+0x19d/0x220
[79885.281146]  [] netlink_sendmsg+0x305/0x3f0
[79885.287595]  [] ? sock_update_classid+0x148/0x2e0
[79885.294650]  [] sock_sendmsg+0xbc/0xf0
[79885.300600]  [] __sys_sendmsg+0x3ac/0x3c0
[79885.306853]  [] ? up_read+0x23/0x40
[79885.312510]  [] ? do_page_fault+0x2bc/0x570
[79885.318968]  [] ? sys_brk+0x44/0x150
[79885.324715]  [] ? fget_light+0x24c/0x520
[79885.330875]  [] sys_sendmsg+0x49/0x90
[79885.336707]  [] system_call_fastpath+0x16/0x1b

Signed-off-by: Narendra K 
Signed-off-by: David S. Miller

bnx2: Clean up remaining iounmap

2012-09-27T23:18:50+00:00

commit c0357e975afdbbedab5c662d19bef865f02adc17 modified bnx2 to switch from
using ioremap/iounmap to pci_iomap/pci_iounmap.  They missed a spot in the error
path of bnx2_init_one though.  This patch just cleans that up.

Signed-off-by: Neil Horman 
CC: Michael Chan 
CC: "David S. Miller" 
Acked-by: Michael Chan 
Signed-off-by: David S. Miller

netdev: pasemi: fix return value check in pasemi_mac_phy_init()

2012-09-27T17:20:50+00:00

In case of error, the function of_phy_connect() returns NULL
pointer not ERR_PTR(). The IS_ERR() test in the return value
check should be replaced with NULL test.

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-09-21T21:32:55+00:00

Pull networking updates from David Miller:
 "More bug fixes, nothing gets past these guys"

 1) More kernel info leaks found by Mathias Krause, this time in the
    IPSEC configuration layers.

 2) When IPSEC policies change, we do not properly make sure that cached
    routes (which could now be stale) throughout the system will be
    revalidated.  Fix this by generalizing the generation count
    invalidation scheme used by ipv4.  From Nicolas Dichtel.

 3) When repairing TCP sockets, we need to allow to restore not just the
    send window scale, but the receive one too.  Extend the existing
    interface to achieve this in a backwards compatible way.  From
    Andrey Vagin.

 4) A fix for FCOE scatter gather feature validation erroneously caused
    scatter gather to be disabled for things like AOE too.  From Ed L
    Cashin.

 5) Several cases of mishandling of error pointers, from Mathias Krause,
    Wei Yongjun, and Devendra Naga.

 6) Fix gianfar build, from Richard Cochran.

 7) CAP_NET_* failures should return -EPERM not -EACCES, from Zhao
    Hongjiang.

 8) Hardware reset fix in janz-ican3 CAN driver, from Ira W Snyder.

 9) Fix oops during rmmod in ti_hecc CAN driver, from Marc Kleine-Budde.

10) The removal of the conditional compilation of the clk support code
    in the stmmac driver broke things.  This is because the interfaces
    used are the ones that don't also perform the enable/disable of the
    clk.  Fix from Stefan Roese.

11) The QFQ packet scheduler can record out of range virtual start
    times, resulting later in misbehavior and even crashes.  Fix from
    Paolo Valente.

12) If MSG_WAITALL is used with IOAT DMA under TCP, we can wedge the
    receiver when the advertised receive window goes to zero.  Detect
    this case and force the processing of the IOAT DMA queue when it
    happens to avoid getting stuck.  Fix from Michal Kubecek.

13) batman-adv assumes that test_bit() returns only 0 or 1, but this is
    not true for x86 (which returns -1 or 0, via the 'sbb' instruction).
    Fix from Linus Lussing.

14) Fix small packet corruption in e1000, from Tushar Dave.

15) make_blackhole() in the IPSEC policy code can do one read unlock too
    many, fix from Li RongQing.

16) The new tcp_try_coalesce() code introduced a bug in TCP URG
    handling, fix from Eric Dumazet.

17) Fix memory leak in __netif_receive_skb() when doing zerocopy and
    when hit an OOM condition.  From Michael S Tsirkin.

18) netxen blindly deferences pdev->bus->self, which is not guarenteed
    to be non-NULL.  Fix from Nikolay Aleksandrov.

19) Fix a performance regression caused by mistakes in ipv6 checksum
    validation in the bnx2x driver, fix from Michal Schmidt.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (45 commits)
  net/stmmac: Use clk_prepare_enable and clk_disable_unprepare
  net: change return values from -EACCES to -EPERM
  net/irda: sh_sir: fix return value check in sh_sir_set_baudrate()
  stmmac: fix return value check in stmmac_open_ext_timer()
  gianfar: fix phc index build failure
  ipv6: fix return value check in fib6_add()
  bnx2x: remove false warning regarding interrupt number
  can: ti_hecc: fix oops during rmmod
  can: janz-ican3: fix support for older hardware revisions
  net: do not disable sg for packets requiring no checksum
  aoe: assert AoE packets marked as requiring no checksum
  at91ether: return PTR_ERR if call to clk_get fails
  xfrm_user: don't copy esn replay window twice for new states
  xfrm_user: ensure user supplied esn replay window is valid
  xfrm_user: fix info leak in copy_to_user_tmpl()
  xfrm_user: fix info leak in copy_to_user_policy()
  xfrm_user: fix info leak in copy_to_user_state()
  xfrm_user: fix info leak in copy_to_user_auth()
  net: qmi_wwan: adding Huawei E367, ZTE MF683 and Pantech P4200
  tcp: restore rcv_wscale in a repair mode (v2)
  ...

net/stmmac: Use clk_prepare_enable and clk_disable_unprepare

2012-09-21T18:59:52+00:00

This patch fixes an issue introduced by commit ID 6a81c26f
[net/stmmac: remove conditional compilation of clk code], which
switched from the internal stmmac_clk_{en}{dis}able calls to
clk_{en}{dis}able. By this, calling clk_prepare and clk_unprepare
was removed.

clk_{un}prepare is mandatory for platforms using common clock framework.
Since these drivers are used by SPEAr platform, which supports common
clock framework, add clk_{un}prepare() support for them. Otherwise
the clocks are not correctly en-/disabled and ethernet support doesn't
work.

Signed-off-by: Stefan Roese 
Cc: Viresh Kumar 
Cc: Giuseppe Cavallaro 
Reviewed-by: Viresh Kumar 
Signed-off-by: David S. Miller

stmmac: fix return value check in stmmac_open_ext_timer()

2012-09-21T17:47:24+00:00

In case of error, the function clk_get() returns ERR_PTR()
and never returns NULL pointer. The NULL test in the error
handling should be replaced with IS_ERR().

dpatch engine is used to auto generated this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun 
Signed-off-by: David S. Miller

gianfar: fix phc index build failure

2012-09-21T17:45:29+00:00

This patch fixes a build failure introduced in commit 66636287
("gianfar: Support the get_ts_info ethtool method."). Not only was a
global variable inconsistently named, but also it was not exported as
it should have been.

This fix is also needed in stable version 3.5.

Signed-off-by: Richard Cochran 
Signed-off-by: David S. Miller

bnx2x: remove false warning regarding interrupt number

2012-09-21T17:27:16+00:00

Since version 7.4 the FW configures in the pci config space the max
number of interrupts available to the physical function, instead of
the exact number to use.
This causes a false warning in driver when comparing the number of
configured interrupts to the number about to be used.

Signed-off-by: Ariel Elior 
Signed-off-by: Eilon Greenstein 
Signed-off-by: David S. Miller

at91ether: return PTR_ERR if call to clk_get fails

2012-09-21T02:21:40+00:00

we are currently returning ENODEV, as the clk_get may give a exact
error code in its returned pointer, assign it to the ret by using the
PTR_ERR function, so that the subsequent goto label will jump to the
error path and clean the driver and return the error correctly.

Signed-off-by: Devendra Naga 
Acked-by: Nicolas Ferre 
Signed-off-by: David S. Miller