linux.git/drivers/net/natsemi.c, branch master

*sonic/natsemi/ns83829: Move the National Semi-conductor drivers

2011-08-11T23:29:21+00:00

Move the National Semi-conductor drivers into drivers/net/ethernet/natsemi/
and make the necessary Kconfig and Makefile changes.  Also moved the 8390
(National Semi-conductor) devices as a sub-menu of National Semi-conductor
devices.

- moved the ibmlana driver as well into this directory since it is a
  "SONIC" driver

CC: Alfred Arnold 
CC: Thomas Bogendoerfer 
CC: Harald Welte 
CC: Tim Hockin 
CC: 
CC: Kevin Chea 
CC: Marc Gauthier 
CC: Chris Zankel 
Signed-off-by: Jeff Kirsher 
Acked-by: Marc Gauthier

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2011-07-25T20:56:39+00:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)

treewide: fix potentially dangerous trailing ';' in #defined values/expressions

2011-07-21T12:10:00+00:00

All these are instances of
  #define NAME value;
or
  #define NAME(params_opt) value;

These of course fail to build when used in contexts like
  if(foo $OP NAME)
  while(bar $OP NAME)
and may silently generate the wrong code in contexts such as
  foo = NAME + 1;    /* foo = value; + 1; */
  bar = NAME - 1;    /* bar = value; - 1; */
  baz = NAME & quux; /* baz = value; & quux; */

Reported on comp.lang.c,
Message-ID: 
Initial analysis of the dangers provided by Keith Thompson in that thread.

There are many more instances of more complicated macros having unnecessary
trailing semicolons, but this pile seems to be all of the cases of simple
values suffering from the problem. (Thus things that are likely to be found
in one of the contexts above, more complicated ones aren't.)

Signed-off-by: Phil Carmody 
Signed-off-by: Jiri Kosina

Merge branch 'master' into for-next

2011-07-11T12:15:55+00:00

Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.

natsemi: fix another dma-debug report

2011-07-10T14:07:40+00:00

commit 2fb83cd618be34546fb526a9051eceaa95517026
Author: FUJITA Tomonori 
Date:   Sun Jul 3 22:34:29 2011 -0700

Above commit fixed previously reported warning, but I later
noticed another one at shutdown.  This commit fixes it.

------------[ cut here ]------------
WARNING: at /home/jimc/projects/lx/linux-2.6/lib/dma-debug.c:820 check_unmap+0x1fe/0x56c()
natsemi 0000:00:06.0: DMA-API: device driver frees DMA memory with different size [device address=0x0000000007356840] [map size=1538 bytes] [unmap size=1522 bytes]
Modules linked in: bridge stp llc x_tables ipv6 pc87360 hwmon_vid scx200_hrt pc8736x_gpio scx200_gpio nsc_gpio scx200_acb i2c_core arc4 rtl8180 mac80211 eeprom_93cx6 cfg80211 pcspkr scx200 rfkill ide_gd_mod ide_pci_generic ohci_hcd usbcore sc1200 ide_core [last unloaded: ebtables]
Pid: 3996, comm: ifconfig Not tainted 3.0.0-rc6-skc-dyndbg+ #104
Call Trace:
 [] warn_slowpath_common+0x4a/0x5f
 [] ? check_unmap+0x1fe/0x56c
 [] warn_slowpath_fmt+0x26/0x2a
 [] check_unmap+0x1fe/0x56c
 [] ? check_preempt_curr+0x5a/0x6a
 [] debug_dma_unmap_page+0x53/0x5b
 [] pci_unmap_single+0x4d/0x57
 [] drain_rx+0x4e/0x74
 [] netdev_close+0x103/0x1b8
 [] ? spin_unlock_bh.clone.30+0x12/0x14
 [] ? dev_deactivate_many+0xc1/0xef
 [] __dev_close_many+0x69/0x86
 [] __dev_close+0x1f/0x2c
 [] __dev_change_flags+0x92/0x107
 [] dev_change_flags+0x13/0x3f
 [] devinet_ioctl+0x248/0x4b3
 [] ? dev_ioctl+0x50a/0x54c
 [] inet_ioctl+0x8e/0xa7
 [] sock_ioctl+0x1b6/0x1da
 [] ? sock_fasync+0x61/0x61
 [] do_vfs_ioctl+0x44d/0x47f
 [] ? do_page_fault+0x268/0x299
 [] ? __put_cred+0x34/0x36
 [] ? sys_faccessat+0x13e/0x14b
 [] sys_ioctl+0x2e/0x4a
 [] syscall_call+0x7/0xb
---[ end trace 7013a1bdac403e56 ]---

Signed-off-by: Jim Cromie 
Signed-off-by: David S. Miller

net/natsemi: Fix module parameter permissions

2011-07-08T16:05:20+00:00

The third parameter of module_param is supposed to represent sysfs
file permissions. A value of "1" leads to the following:

$ ls -l /sys/module/natsemi/parameters/
total 0
---------x 1 root root 4096 Jul  8 09:46 dspcfg_workaround

I am changing it to "0" to align with the other module parameters in
this driver.

Signed-off-by: Jean Delvare 
Cc: Tim Hockin 
Cc: Mark Brown 
Signed-off-by: David S. Miller

natsemi: silence dma-debug warnings

2011-07-04T05:34:29+00:00

This silences dma-debug warnings:

https://lkml.org/lkml/2011/6/30/341

------------[ cut here ]------------
WARNING: at /home/jimc/projects/lx/linux-2.6/lib/dma-debug.c:820
check_unmap+0x1fe/0x56a()
natsemi 0000:00:06.0: DMA-API: device driver frees DMA memory with
different size [device address=0x0000000006ef0040] [map size=1538
bytes] [unmap size=1522 bytes]
Modules linked in: pc8736x_gpio pc87360 hwmon_vid scx200_gpio nsc_gpio
scx200_hrt scx200_acb i2c_core arc4 rtl8180 mac80211 eeprom_93cx6
cfg80211 pcspkr rfkill scx200 ide_gd_mod ide_pci_generic ohci_hcd
usbcore sc1200 ide_core
Pid: 870, comm: collector Not tainted 3.0.0-rc5-sk-00080-gca56a95 #1
Call Trace:
 [] warn_slowpath_common+0x4a/0x5f
 [] ? check_unmap+0x1fe/0x56a
 [] warn_slowpath_fmt+0x26/0x2a
 [] check_unmap+0x1fe/0x56a
 [] debug_dma_unmap_page+0x53/0x5b
 [] pci_unmap_single+0x4d/0x57
 [] natsemi_poll+0x343/0x5ca
 [] ? try_to_wake_up+0xea/0xfc
 [] ? spin_unlock_irq.clone.28+0x18/0x23
 [] net_rx_action+0x3f/0xe5
 [] __do_softirq+0x5b/0xd1
 [] ? local_bh_enable+0xa/0xa
   [] ? irq_exit+0x34/0x75
 [] ? do_IRQ+0x66/0x79
 [] ? common_interrupt+0x29/0x30
 [] ? finish_task_switch.clone.118+0x31/0x72
 [] ? schedule+0x3b2/0x3f1
 [] ? hrtimer_start_range_ns+0x10/0x12
 [] ? hrtimer_start_expires+0x1c/0x24
 [] ? schedule_hrtimeout_range_clock+0x8e/0xb4
 [] ? update_rmtp+0x68/0x68
 [] ? schedule_hrtimeout_range+0xa/0xc
 [] ? poll_schedule_timeout+0x27/0x3e
 [] ? do_select+0x488/0x4cd
 [] ? finish_task_switch.clone.118+0x43/0x72
 [] ? need_resched+0x14/0x1e
 [] ? poll_freewait+0x74/0x74
 [] ? need_resched+0x14/0x1e
 [] ? schedule+0x3e1/0x3f1
 [] ? irq_exit+0x47/0x75
 [] ? need_resched+0x14/0x1e
 [] ? preempt_schedule_irq+0x44/0x4a
 [] ? need_resched+0x17/0x19
 [] ? put_dec_full+0x7b/0xaa
 [] ? blkdev_ioctl+0x434/0x618
 [] ? put_dec+0x2f/0x6d
 [] ? number.clone.1+0x10b/0x1d0
 [] ? preempt_schedule_irq+0x44/0x4a
 [] ? need_resched+0x17/0x19
 [] ? vsnprintf+0x225/0x264
 [] ? vsnprintf+0x7f/0x264
 [] ? seq_printf+0x22/0x40
 [] ? do_task_stat+0x582/0x5a3
 [] ? poll_schedule_timeout+0x27/0x3e
 [] ? core_sys_select+0x11f/0x1a3
 [] ? poll_schedule_timeout+0x27/0x3e
 [] ? proc_tgid_stat+0xd/0xf
 [] ? recalc_sigpending+0x32/0x35
 [] ? __set_task_blocked+0x64/0x6a
 [] ? timespec_add_safe+0x24/0x48
 [] ? spin_unlock_irq.clone.16+0x18/0x23
 [] ? sys_pselect6+0xe5/0x13e
 [] ? syscall_call+0x7/0xb
 [] ? rpc_clntdir_depopulate+0x26/0x30
---[ end trace 180dcac41a50938b ]---

Reported-by: Jim Cromie 
Signed-off-by: FUJITA Tomonori 
Tested-by: Jim Cromie 
Signed-off-by: David S. Miller

treewide: transciever/transceiver spelling fixes

2011-06-24T09:20:14+00:00

Just tyops.

Signed-off-by: Joe Perches 
Signed-off-by: Jiri Kosina

ethtool: cosmetic: Use ethtool ethtool_cmd_speed API

2011-04-29T21:03:01+00:00

This updates the network drivers so that they don't access the
ethtool_cmd::speed field directly, but use ethtool_cmd_speed()
instead.

For most of the drivers, these changes are purely cosmetic and don't
fix any problem, such as for those 1GbE/10GbE drivers that indirectly
call their own ethtool get_settings()/mii_ethtool_gset(). The changes
are meant to enforce code consistency and provide robustness with
future larger throughputs, at the expense of a few CPU cycles for each
ethtool operation.

All drivers compiled with make allyesconfig ion x86_64 have been
updated.

Tested: make allyesconfig on x86_64 + e1000e/bnx2x work
Signed-off-by: David Decotigny 
Signed-off-by: David S. Miller

ethtool: Use full 32 bit speed range in ethtool's set_settings

2011-04-29T21:03:00+00:00

This makes sure the ethtool's set_settings() callback of network
drivers don't ignore the 16 most significant bits when ethtool calls
their set_settings().

All drivers compiled with make allyesconfig on x86_64 have been
updated.

Signed-off-by: David Decotigny 
Signed-off-by: David S. Miller