linux.git/drivers/net, branch v3.17-rc5

Merge tag 'master-2014-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2014-09-07T23:11:10+00:00

John W. Linville says:

====================
pull request: wireless 2014-09-05

Please pull this batch of fixes intended for the 3.17 stream...

For the mac80211 bits, Johannes says:

"Here are a few fixes for mac80211. One has been discussed for a while
and adds a terminating NUL-byte to the alpha2 sent to userspace, which
shouldn't be necessary but since many places treat it as a string we
couldn't move to just sending two bytes.

In addition to that, we have two VLAN fixes from Felix, a mesh fix, a
fix for the recently introduced RX aggregation offload, a revert for
a broken patch (that luckily didn't really cause any harm) and a small
fix for alignment in debugfs."

For the iwlwifi bits, Emmanuel says:

"I revert a patch that disabled CTS to self in dvm because users
reported issues. The revert is CCed to stable since the offending
patch was sent to stable too. I also bump the firmware API versions
since a new firmware is coming up. On top of that, Marcel fixes a
bug I introduced while fixing a bug in our Kconfig file."

Please let me know if there are problems!
====================

Signed-off-by: David S. Miller

amd-xgbe: Enable interrupts for all management counters

2014-09-06T05:37:30+00:00

As the management counters reach a threshold they will generate an
interrupt so the value can be saved and the counter reset. The
current code does not enable this interrupt on all counters. This
can result in inaccurate statistics.

Update the code to enable all the counters to generate an interrupt
when its threshold is exceeded.

Signed-off-by: Tom Lendacky 
Signed-off-by: David S. Miller

amd-xgbe: Treat certain counter registers as 64 bit

2014-09-06T05:37:30+00:00

Even if the management counters are configured to be 32 bit register
values, the [rt]xoctetcount_gb and [rt]xoctetcount_g counters are
always 64 bit counter registers.  Since they are not being treated as
64 bit values, these statistics are being reported incorrectly (ifconfig,
ethtool, etc.).

Update the routines used to read the registers to access the "hi"
register (an offset of 4 from the "lo" register) to create a 64 bit
value for these 64 bit counters.

Signed-off-by: Tom Lendacky 
Signed-off-by: David S. Miller

greth: moved TX ring cleaning to NAPI rx poll func

2014-09-06T04:57:09+00:00

This patch does not affect the 10/100 GRETH MAC.

Before all GBit GRETH TX descriptor ring cleaning was done in
start_xmit(), when descriptor list became full it activated
TX interrupt to start the NAPI rx poll function to do TX ring
cleaning.

With this patch the TX descriptor ring is always cleaned from
the NAPI rx poll function, triggered via TX or RX interrupt.
Otherwise we could end up in TX frames being sent but not
reported to the stack being sent. On the 10/100 GRETH this
is not an issue since the SKB is copied&aligned into private
buffers so that the SKB can be freed directly on start_xmit()

Signed-off-by: Daniel Hellstrom 
Signed-off-by: David S. Miller

cnic : Cleanup CONFIG_IPV6 & VLAN check

2014-09-06T03:47:14+00:00

The cnic module needs to ensure that if ipv6 support is compiled as a module,
then the cnic module cannot be compiled as built-in as it depends on ipv6.
Made this check cleaner via Kconfig

Use simpler IS_ENABLED for CONFIG_VLAN_8021Q check

Signed-off-by: Anish Bhatt 
Acked-by: Michael Chan 
Signed-off-by: David S. Miller

bnx2x: Fix link problems for 1G SFP RJ45 module

2014-09-06T00:28:37+00:00

When 1G SFP RJ45 module is detected, driver must reset the Tx laser
in order to prevent link issues. As part of change, the link_attr_sync
was relocated from vars to params.

Signed-off-by: Yaniv Rosner 
Signed-off-by: Yuval Mintz 
Signed-off-by: David S. Miller

3c59x: avoid panic in boomerang_start_xmit when finding page address:

2014-09-06T00:24:02+00:00

This bug was reported on a very old kernel (RHEL6, 2.6.32-491.el6):

BUG: unable to handle kernel paging request at 00800000
IP: [] nommu_map_page+0x15/0x110
*pdpt = 000000003454f001 *pde = 000000003f03d067
Oops: 0000 [#1] SMP
last sysfs file: /sys/devices/system/cpu/online
Modules linked in: nfsd lockd nfs_acl auth_rpcgss sunrpc exportfs p4_clockmod
ipv6 ppdev parport_pc parport microcode iTCO_wdt iTCO_vendor_support 3c59x mii
dcdbas serio_raw snd_intel8x0 snd_ac97_codec ac97_bus snd_seq snd_seq_device
snd_pcm snd_timer snd soundcore snd_page_alloc i2c_i801 sg lpc_ich mfd_core ext4
jbd2 mbcache sr_mod cdrom sd_mod crc_t10dif pata_acpi ata_generic ata_piix
radeon ttm drm_kms_helper drm i2c_algo_bit i2c_core dm_mirror dm_region_hash
dm_log dm_mod [last unloaded: mperf]

Pid: 4219, comm: nfsd Not tainted 2.6.32-491.el6.i686 #1 Dell Computer
Corporation OptiPlex GX240               /OptiPlex GX240
EIP: 0060:[] EFLAGS: 00010246 CPU: 0
EIP is at nommu_map_page+0x15/0x110
EAX: 00000000 EBX: c0a83480 ECX: 00000000 EDX: 00800000
ESI: 00000000 EDI: f70e7860 EBP: e2d09b54 ESP: e2d09b24
 DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
Process nfsd (pid: 4219, ti=e2d08000 task=e2ceaaa0 task.ti=e2d08000)
Stack:
 00000056 00000000 0000000e c65efd38 00000020 00000296 00000206 00000206
<0> c050c850 c0a83480 e2cef154 00000001 e2d09ba8 f8fcd585 00000510 00000001
<0> 00000000 00000000 f5172200 f8fdac00 0039ef8c f5277020 f70e7860 00000510
Call Trace:
 [] ? page_address+0xd0/0xe0
 [] ? boomerang_start_xmit+0x3b5/0x520 [3c59x]
 [] ? dev_hard_start_xmit+0xe5/0x400
 [] ? ip6_output_finish+0x0/0xf0 [ipv6]
 [] ? sch_direct_xmit+0x113/0x180
 [] ? nf_hook_slow+0x68/0x120
 [] ? dev_queue_xmit+0x1b5/0x290
 [] ? ip6_output_finish+0x6d/0xf0 [ipv6]
 [] ? ip6_xmit+0x3e8/0x490 [ipv6]
 [] ? inet6_csk_xmit+0x289/0x2f0 [ipv6]
 [] ? tcp_transmit_skb+0x431/0x7f0
 [] ? __alloc_skb+0x4f/0x140
 [] ? tcp_write_xmit+0x1c2/0xa50
 [] ? __tcp_push_pending_frames+0x31/0xe0
 [] ? tcp_sendpage+0x44a/0x4b0
 [] ? tcp_sendpage+0x0/0x4b0
 [] ? kernel_sendpage+0x4e/0x90
 [] ? svc_send_common+0xc9/0x120 [sunrpc]
 [] ? svc_sendto+0x75/0x1f0 [sunrpc]
 [] ? _atomic_dec_and_lock+0x59/0x90
 [] ? nfs3svc_encode_readres+0x0/0xc0 [nfsd]
 [] ? svc_authorise+0x2d/0x40 [sunrpc]
 [] ? nfs3svc_release_fhandle+0x0/0x10 [nfsd]
 [] ? svc_process_common+0xf1/0x5a0 [sunrpc]
 [] ? svc_tcp_sendto+0x36/0xa0 [sunrpc]
 [] ? svc_send+0x98/0xd0 [sunrpc]
 [] ? nfsd+0xac/0x140 [nfsd]
 [] ? complete+0x40/0x60
 [] ? nfsd+0x0/0x140 [nfsd]
 [] ? kthread+0x7c/0xa0
 [] ? kthread+0x0/0xa0
 [] ? kernel_thread_helper+0x7/0x10
Code: 8d b6 00 00 00 00 eb f8 8d b4 26 00 00 00 00 8d bc 27 00 00 00 00 55 89 e5
83 ec 30 89 75 f8 31 f6 89 7d fc 89 c7 89 c8 89 5d f4 <8b> 1a 8b 4d 08 c1 eb 19
c1 e3 04 8b 9b c0 29 c7 c0 83 e3 fc 29

But the problem seems to still exist upstream.  It seems on 32 bit kernels
page_address() can reutrn a NULL value in some circumstances, and the
pci_map_single api isn't prepared to handle that (on this system it results in a
bogus pointer deference in nommu_map_page.

The fix is pretty easy, if we convert the 3c59x driver to use the more
convieient skb_frag_dma_map api we don't need to find the virtual address of the
page at all, and page gets mapped to the hardware properly.  Verified to fix the
problem as described by the reporter.

Applies to the net tree

Change Notes:

v2) Converted PCI_DMA_TODEVICE to DMA_TO_DEVICE.  Thanks Dave!

v3) Actually Run git commit after making changes to v2 :)

Signed-off-by: Neil Horman 
CC: klassert@mathematik.tu-chemnitz.de
CC: "David S. Miller" 
Signed-off-by: David S. Miller

drivers/net/fddi/skfp/h/skfbi.h: Remove useless PCI_BASE_2ND macros

2014-09-05T21:51:09+00:00

They are use less, and may generate compiling warnings, so remove them
(microblaze, arc, arm64, and unicore32 have already defined PCI_IOBASE).

The related warnings (with allmodconfig under microblaze):

  CC [M]  drivers/net/fddi/skfp/skfddi.o
  In file included from drivers/net/fddi/skfp/skfddi.c:95:0:
  drivers/net/fddi/skfp/h/skfbi.h:151:0: warning: "PCI_IOBASE" redefined
   #define PCI_IOBASE 0xffffff00L  /* Bit 31..8:  I/O Base address */
   ^
  In file included from include/linux/io.h:22:0,
                   from include/linux/pci.h:31,
                   from drivers/net/fddi/skfp/skfddi.c:82:
  ./arch/microblaze/include/asm/io.h:33:0: note: this is the location of the previous definition
   #define PCI_IOBASE ((void __iomem *)_IO_BASE)
   ^

Signed-off-by: Chen Gang 
Signed-off-by: David S. Miller

VMXNET3: Check for map error in vmxnet3_set_mc

2014-09-05T18:50:39+00:00

We should check if the map of the table actually succeeds, and also free
resources accordingly.

Version bumped to 1.2.1.0

Acked-by: Shelley Gong 
Acked-by: Bhavesh Davda 
Signed-off-by: Andy King 
Reported-by: Tetsuo Handa 
Signed-off-by: David S. Miller

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

2014-09-04T17:12:02+00:00