1. 10 4月, 2013 8 次提交
  2. 09 4月, 2013 9 次提交
  3. 08 4月, 2013 14 次提交
  4. 05 4月, 2013 3 次提交
  5. 03 4月, 2013 6 次提交
    • G
      net/nxp/lpc_eth: Drop ifdef CONFIG_OF_NET · be0e2f1f
      Guenter Roeck 提交于
      Since of_get_mac_address() is now declared even if CONFIG_OF_NET
      is not configured, the ifdef is no longer necessary and can be
      removed.
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      be0e2f1f
    • G
      net/freescale/fec: Simplify OF dependencies · 6c5f7808
      Guenter Roeck 提交于
      Since of_get_mac_address() is now defined even if CONFIG_OF_NET
      is not configured, the ifdef around the code calling it is no longer
      necessary and can be removed.
      
      Similar, since of_get_phy_mode() is now defined as dummy function
      if OF_NET is not configured, it is no longer necessary to provide
      an OF dependent function as front-end. Also, the function depends
      on OF_NET, not on OF, so the conditional code was not correct anyway.
      Drop the front-end function and call of_get_phy_mode() directly.
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6c5f7808
    • G
      net/cadence/macb: Simplify OF dependencies · 50907043
      Guenter Roeck 提交于
      With of_get_mac_address() and of_get_phy_mode() now defined as dummy
      functions if OF_NET is not configured, it is no longer necessary to
      provide OF dependent functions as front-end. Also, the two functions
      depend on OF_NET, not on OF, so the conditional code was not correct
      anyway.
      
      Drop the front-end functions and call of_get_mac_address() and
      of_get_phy_mode() directly instead.
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      50907043
    • G
      net/cadence/at91_ether: Simplify OF dependencies · f9b12490
      Guenter Roeck 提交于
      With of_get_mac_address() and of_get_phy_mode() now defined as dummy
      functions if OF_NET is not configured, it is no longer necessary to
      provide OF dependent functions as front-end. Also, the two functions
      depend on OF_NET, not on OF, so the conditional code was not correct
      anyway.
      
      Drop the front-end functions and call of_get_mac_address() and
      of_get_phy_mode() directly instead.
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f9b12490
    • N
      forcedeth: Do a dma_mapping_error check after skb_frag_dma_map · f7f22874
      Neil Horman 提交于
      This backtrace was recently reported on a 3.9 kernel:
      
      Actual results: from syslog /var/log/messsages:
      kernel: [17539.340285] ------------[ cut here ]------------
      kernel: [17539.341012] WARNING: at lib/dma-debug.c:937 check_unmap+0x493/0x960()
      kernel: [17539.341012] Hardware name: MS-7125
      kernel: [17539.341012] forcedeth 0000:00:0a.0: DMA-API: device driver failed to
      check map error[device address=0x0000000013c88000] [size=544 bytes] [mapped as
      page]
      kernel: [17539.341012] Modules linked in: fuse ebtable_nat ipt_MASQUERADE
      nf_conntrack_netbios_ns nf_conntrack_broadcast ip6table_nat nf_nat_ipv6
      ip6table_mangle ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 iptable_nat
      nf_nat_ipv4 nf_nat iptable_mangle nf_conntrack_ipv4 nf_defrag_ipv4 xt_conntrack
      nf_conntrack bnep bluetooth rfkill ebtable_filter ebtables ip6table_filter
      ip6_tables snd_hda_codec_hdmi snd_cmipci snd_mpu401_uart snd_hda_intel
      snd_intel8x0 snd_opl3_lib snd_ac97_codec gameport snd_hda_codec snd_rawmidi
      ac97_bus snd_hwdep snd_seq snd_seq_device snd_pcm snd_page_alloc snd_timer snd
      k8temp soundcore serio_raw i2c_nforce2 forcedeth ata_generic pata_acpi nouveau
      video mxm_wmi wmi i2c_algo_bit drm_kms_helper ttm drm i2c_core sata_sil pata_amd
      sata_nv uinput
      kernel: [17539.341012] Pid: 17340, comm: sshd Not tainted
      3.9.0-0.rc4.git0.1.fc19.i686.PAE #1
      kernel: [17539.341012] Call Trace:
      kernel: [17539.341012]  [<c045573c>] warn_slowpath_common+0x6c/0xa0
      kernel: [17539.341012]  [<c0701953>] ? check_unmap+0x493/0x960
      kernel: [17539.341012]  [<c0701953>] ? check_unmap+0x493/0x960
      kernel: [17539.341012]  [<c04557a3>] warn_slowpath_fmt+0x33/0x40
      kernel: [17539.341012]  [<c0701953>] check_unmap+0x493/0x960
      kernel: [17539.341012]  [<c049238f>] ? sched_clock_cpu+0xdf/0x150
      kernel: [17539.341012]  [<c0701e87>] debug_dma_unmap_page+0x67/0x70
      kernel: [17539.341012]  [<f7eae8f2>] nv_unmap_txskb.isra.32+0x92/0x100
      
      Its pretty plainly the result of an skb fragment getting unmapped without having
      its initial mapping operation checked for errors.  This patch corrects that.
      Signed-off-by: NNeil Horman <nhorman@tuxdriver.com>
      CC: "David S. Miller" <davem@davemloft.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f7f22874
    • R
      e0664d3d