platform/kernel/linux-rpi.git
10 years agoStaging: unisys: visorchipset: Remove filexfer.c
Ken Cox [Thu, 22 May 2014 17:31:14 +0000 (12:31 -0500)]
Staging: unisys: visorchipset: Remove filexfer.c

There is not any code using the functionality in filexfer.c so I removed it
and filexfer.h.

Signed-off-by: Ken Cox <jkc@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: unisys: Fixup sparse warnings for dereferencing noderef types.
Ken Cox [Thu, 22 May 2014 17:31:13 +0000 (12:31 -0500)]
Staging: unisys: Fixup sparse warnings for dereferencing noderef types.

Fixed the usage of the following so they don't try to dereference
pointers to iomem.
CHANNEL_U64_MISMATCH
CHANNEL_U32_MISMATCH
wait_for_valid_guid

Signed-off-by: Ken Cox <jkc@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: unisys: Remove unused macros from visorchannel/visorchannel.h
Ken Cox [Thu, 22 May 2014 17:31:12 +0000 (12:31 -0500)]
Staging: unisys: Remove unused macros from visorchannel/visorchannel.h

VISORCHANNEL_CHANGE_SERVER_STATE and VISORCHANNEL_CHANGE_CLIENT_STATE
are never used in any of the source so they have been removed.

VISORCHANNEL_CHANGE_CLIENT_STATE would have caused a broken kernel build
after commit  a8d7f21d, but since it was never used the kernel continued
to build.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Ken Cox <jkc@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: unisys: virthba: declare virthba_queue_command as static
Ken Cox [Thu, 22 May 2014 17:31:11 +0000 (12:31 -0500)]
Staging: unisys: virthba: declare virthba_queue_command as static

virthba_queue_command() is only used inside virthba.c so declare it static.

Signed-off-by: Ken Cox <jkc@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: unisys: Fix sparse warnings
Ken Cox [Thu, 22 May 2014 17:31:09 +0000 (12:31 -0500)]
Staging: unisys: Fix sparse warnings

Fix sparse warnings caused by incorrect references to IO space.

Signed-off-by: Ken Cox <jkc@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: slicoss: handle errors from slic_config_get
David Matlack [Fri, 23 May 2014 04:38:45 +0000 (21:38 -0700)]
staging: slicoss: handle errors from slic_config_get

slic_config_get() can fail. Change the return type from void to
int and handle the error in slic_card_init(). So now, instead of
silently failing (and then timing out waiting for the config data),
the driver will fail loudly at request time.

Signed-off-by: David Matlack <matlackdavid@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: slicoss: fail on corrupt eeprom
David Matlack [Tue, 20 May 2014 05:04:00 +0000 (22:04 -0700)]
staging: slicoss: fail on corrupt eeprom

Remove fail_on_bad_eeprom, which was always 0 and thus being used
to ignore incorrect checksumming. This means devices with corrupt
eeprom will now cause the driver to fail.

Since fail_on_bad_eeprom was the last member in use of struct
slic_reg_params, remove that struct altogether.

Signed-off-by: David Matlack <matlackdavid@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: slicoss: fix eeprom checksum code
David Matlack [Tue, 20 May 2014 05:03:59 +0000 (22:03 -0700)]
staging: slicoss: fix eeprom checksum code

Rewrite slic_eeprom_cksum() to fix bugs and make readable. This patch
technically has no effect on the user as failed eeprom checksums are
ignored anyway.

The original implementation had the following issues:

  1. 2 of the 3 unrolled loops had the following bug:

       while ((len -= 32) >= 0) {
               [...]
               sum += w[15];
               w = (u16 *)((ulong) w + 16);    /* verify */
       }

     This processes 32-bytes of data but only increments the word
     pointer by 16 bytes. Fixing both of these bugs seems to fix
     slic_eeprom_cksum().

  2. Non-descriptive variable names, use of unions, and macros that
     change local state make the code difficult to read.

  3. The checksum loop is unrolled which makes the code harder to
     reason about while providing small performance improvement:
      - max eeprom length is 0x80 bytes (MAX_EECODE_SIZE), that's
        only 0x40 iterations
      - checksum is only computed during pci probe(), so not very
        often

Tested on Mojave card

Signed-off-by: David Matlack <matlackdavid@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: slicoss: fix use-after-free bug in slic_entry_remove
David Matlack [Tue, 6 May 2014 04:02:37 +0000 (21:02 -0700)]
staging: slicoss: fix use-after-free bug in slic_entry_remove

This patch fixes a use-after-free bug that causes a null pointer
dereference in slic_entry_halt.

Since unregister_netdev() will ultimately call slic_entry_halt (the
net_device ndo_stop() virtual function for this device), we should
call it before freeing the memory used by slic_entry_halt.

Signed-off-by: David Matlack <dmatlack@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: slicoss: fix 64-bit isr address bug
David Matlack [Tue, 6 May 2014 04:02:36 +0000 (21:02 -0700)]
staging: slicoss: fix 64-bit isr address bug

This patch fixes a bug that only manifests when the physical address of
the interrupt status register is >4GB. Specifically, the driver was only
telling the device about the lower 32 bits of the ISR. This patch adds
the upper 32 bits.

Signed-off-by: David Matlack <dmatlack@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: slicoss: fix dma memory leak
David Matlack [Tue, 6 May 2014 04:02:35 +0000 (21:02 -0700)]
staging: slicoss: fix dma memory leak

This patch fixes a memory leak in slic_card_init. If the driver fails
to poll for an interrupt after requesting config data from the device
the dma memory is never freed.

Signed-off-by: David Matlack <dmatlack@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: slicoss: remove gratuitous debug infrastructure
David Matlack [Tue, 6 May 2014 04:02:34 +0000 (21:02 -0700)]
staging: slicoss: remove gratuitous debug infrastructure

As per the TODO file, this patch removes the gratuitous debug
infrastructure. As an extra incentive for removing this code,
the debugfs files are not cleaned up properly. For example, if
register_netdev() fails in slic_entry_probe() then all debugfs
files get left behind, even after the driver module is unloaded.
Touching these files quickly leads to an oops.

Signed-off-by: David Matlack <dmatlack@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: slicoss: remove unused members of struct adapter
David Matlack [Tue, 6 May 2014 04:02:33 +0000 (21:02 -0700)]
staging: slicoss: remove unused members of struct adapter

This patch removes two fields from the private "struct adapter".
Specifically,

memorybase      duplicate of slic_regs

memorylength    written once and never read. This field is trivially
                computed with pci_resource_len if it's ever needed in
                the future.

Signed-off-by: David Matlack <dmatlack@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: slicoss: fix multiple free-after-free in slic_entry_remove
David Matlack [Tue, 6 May 2014 04:02:32 +0000 (21:02 -0700)]
staging: slicoss: fix multiple free-after-free in slic_entry_remove

This patch fixes two free-after-free bugs in slic_entry_remove.
Specifically, slic_unmap_mmio_space() iounmaps adapter->slic_regs,
which is the same region of memory as dev->base_addr (iounmap-ed
a few lines later).

Next, both release_mem_region() and pci_release_regions() are called
on the same pci_dev struct.

Signed-off-by: David Matlack <dmatlack@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: slicoss: fix use-after-free in slic_entry_probe
David Matlack [Tue, 6 May 2014 04:02:31 +0000 (21:02 -0700)]
staging: slicoss: fix use-after-free in slic_entry_probe

This patch fixes a use-after-free bug that can cause a kernel
oops. If slic_card_init fails then slic_entry_probe (the pci
probe() function for this device) will return error without
cleaning up memory.

Signed-off-by: David Matlack <dmatlack@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging:Octeon-usb:octeon-hcd.c return value
Paul McQuade [Tue, 8 Apr 2014 15:32:48 +0000 (16:32 +0100)]
Staging:Octeon-usb:octeon-hcd.c return value

return value instead of function.

Signed-off-by: Paul McQuade <paulmcquad@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Use kmemdup() instead of memcpy() to duplicate memory
Benoit Taine [Thu, 22 May 2014 13:08:33 +0000 (15:08 +0200)]
staging: rtl8723au: Use kmemdup() instead of memcpy() to duplicate memory

This issue was reported by coccicheck using the semantic patch
at scripts/coccinelle/api/memdup.cocci, and tested by compilation.

Signed-off-by: Benoit Taine <benoit.taine@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: realtek: Convert /n to \n
Joe Perches [Wed, 21 May 2014 07:38:38 +0000 (09:38 +0200)]
staging: realtek: Convert /n to \n

Use proper line terminations.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_sta_mgt: change rtw_alloc_stainfo23a to use gfp_t instead...
Karim Raslan [Wed, 21 May 2014 07:38:37 +0000 (09:38 +0200)]
staging: rtl8723au: rtw_sta_mgt: change rtw_alloc_stainfo23a to use gfp_t instead if int

This should fix a few sparse warnings like the following:

  CHECK   drivers/staging/rtl8723au/core/rtw_ap.c
drivers/staging/rtl8723au/core/rtw_ap.c:1054:45: warning: incorrect type in argument 3 (different base types)
drivers/staging/rtl8723au/core/rtw_ap.c:1054:45:    expected int [signed] gfp
drivers/staging/rtl8723au/core/rtw_ap.c:1054:45:    got restricted gfp_t

Signed-off-by: Karim Raslan <karim.allah.ahmed@gmail.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_mlme_ext.c: Fixup some more unreadable formatting
Jes Sorensen [Wed, 21 May 2014 07:38:36 +0000 (09:38 +0200)]
staging: rtl8723au: rtw_mlme_ext.c: Fixup some more unreadable formatting

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_mlme_ext.c: Improve bad formatting in event handlers
Jes Sorensen [Wed, 21 May 2014 07:38:35 +0000 (09:38 +0200)]
staging: rtl8723au: rtw_mlme_ext.c: Improve bad formatting in event handlers

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Declare rtw_site_survey() static
Jes Sorensen [Wed, 21 May 2014 07:38:34 +0000 (09:38 +0200)]
staging: rtl8723au: Declare rtw_site_survey() static

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove obsolete rtw_action_frame_parse23a()
Jes Sorensen [Wed, 21 May 2014 07:38:33 +0000 (09:38 +0200)]
staging: rtl8723au: Remove obsolete rtw_action_frame_parse23a()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_cfg80211_rx_action(): Use ieee80211_mgmt to parse action...
Jes Sorensen [Wed, 21 May 2014 07:38:32 +0000 (09:38 +0200)]
staging: rtl8723au: rtw_cfg80211_rx_action(): Use ieee80211_mgmt to parse action frame

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_cfg80211_monitor_if_xmit_entry() use struct ieee80211_mgmt
Jes Sorensen [Wed, 21 May 2014 07:38:31 +0000 (09:38 +0200)]
staging: rtl8723au: rtw_cfg80211_monitor_if_xmit_entry() use struct ieee80211_mgmt

Use struct ieee80211_mgmt to parse action frame. In addition remove
unused functions rtw_cfg80211_rx_p2p_action_public() and
rtw_cfg80211_rx_action_p2p()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_get_bcn_info23a(): Don't zero variables unncessarily
Jes Sorensen [Wed, 21 May 2014 07:38:30 +0000 (09:38 +0200)]
staging: rtl8723au: rtw_get_bcn_info23a(): Don't zero variables unncessarily

In addition remove excessive brackets.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_get_bcn_info23a(): Use cfg80211_find_ie()
Jes Sorensen [Wed, 21 May 2014 07:38:29 +0000 (09:38 +0200)]
staging: rtl8723au: rtw_get_bcn_info23a(): Use cfg80211_find_ie()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_ieee80211.c: Remove a number of unused functions
Jes Sorensen [Wed, 21 May 2014 07:38:28 +0000 (09:38 +0200)]
staging: rtl8723au: rtw_ieee80211.c: Remove a number of unused functions

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_cmd.h: Remove some more unused #defines
Jes Sorensen [Wed, 21 May 2014 07:38:27 +0000 (09:38 +0200)]
staging: rtl8723au: rtw_cmd.h: Remove some more unused #defines

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Get rid of some unused tdls definitions
Jes Sorensen [Wed, 21 May 2014 07:38:26 +0000 (09:38 +0200)]
staging: rtl8723au: Get rid of some unused tdls definitions

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Move dummy_event_callback() to rtw_mlme_ext.c
Jes Sorensen [Wed, 21 May 2014 07:38:25 +0000 (09:38 +0200)]
staging: rtl8723au: Move dummy_event_callback() to rtw_mlme_ext.c

In addition get rid of a couple of empty *_event_callback() handlers
and use dummy_event_callback() instead.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Get rid of unused get_bsstype23a()
Jes Sorensen [Wed, 21 May 2014 07:38:24 +0000 (09:38 +0200)]
staging: rtl8723au: Get rid of unused get_bsstype23a()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Declare SetBWMode23a() static
Jes Sorensen [Wed, 21 May 2014 07:38:23 +0000 (09:38 +0200)]
staging: rtl8723au: Declare SetBWMode23a() static

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Don't compile rtw_ap.c when CONFIG_8723AU_AP_MODE=n
Jes Sorensen [Wed, 21 May 2014 07:38:22 +0000 (09:38 +0200)]
staging: rtl8723au: Don't compile rtw_ap.c when CONFIG_8723AU_AP_MODE=n

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_mlme_ext.c: Fix compile warnings
Jes Sorensen [Wed, 21 May 2014 07:38:21 +0000 (09:38 +0200)]
staging: rtl8723au: rtw_mlme_ext.c: Fix compile warnings

Fixup #ifdefs to not build issue_assocrsp() and OnAuth23a() when
CONFIG_8723AU_AP_MODE is not set.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_mlme_ext.c: Declare a number of functions static
Jes Sorensen [Wed, 21 May 2014 07:38:20 +0000 (09:38 +0200)]
staging: rtl8723au: rtw_mlme_ext.c: Declare a number of functions static

These are all just used locally, no point cluttering the kernel
namespace with them.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: wifi.h: Get rid of last ugly frame_control manipulation macros
Jes Sorensen [Wed, 21 May 2014 07:38:19 +0000 (09:38 +0200)]
staging: rtl8723au: wifi.h: Get rid of last ugly frame_control manipulation macros

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtl8723a_cmd.c: Get rid of SetToDs()/SetFrDs() usage
Jes Sorensen [Wed, 21 May 2014 07:38:18 +0000 (09:38 +0200)]
staging: rtl8723au: rtl8723a_cmd.c: Get rid of SetToDs()/SetFrDs() usage

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_xmit.c: Get rid of SetToDs()/SetFrDs() usage
Jes Sorensen [Wed, 21 May 2014 07:38:17 +0000 (09:38 +0200)]
staging: rtl8723au: rtw_xmit.c: Get rid of SetToDs()/SetFrDs() usage

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_mlme_ext.c: Get rid of SetToDs()/SetFrDs() usage
Jes Sorensen [Wed, 21 May 2014 07:38:16 +0000 (09:38 +0200)]
staging: rtl8723au: rtw_mlme_ext.c: Get rid of SetToDs()/SetFrDs() usage

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Get rid of duplicate ieee80211 frame_control defines
Jes Sorensen [Wed, 21 May 2014 07:38:15 +0000 (09:38 +0200)]
staging: rtl8723au: Get rid of duplicate ieee80211 frame_control defines

This is all defined nicely in ieee80211.h, this was all duplication
serving no other purpose than to obfuscate the code.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Fix issue_assocrsp() to use IEEE80211_STYPE_* defines
Jes Sorensen [Wed, 21 May 2014 07:38:14 +0000 (09:38 +0200)]
staging: rtl8723au: Fix issue_assocrsp() to use IEEE80211_STYPE_* defines

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Declare issue_asocrsp() static
Jes Sorensen [Wed, 21 May 2014 07:38:13 +0000 (09:38 +0200)]
staging: rtl8723au: Declare issue_asocrsp() static

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_mlme_ext.c: Get rid of most WIFI_* frame type usage
Jes Sorensen [Wed, 21 May 2014 07:38:12 +0000 (09:38 +0200)]
staging: rtl8723au: rtw_mlme_ext.c: Get rid of most WIFI_* frame type usage

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: ioctl_cfg80211.c: Use ieee80211.h provided fctl bits
Jes Sorensen [Wed, 21 May 2014 07:38:11 +0000 (09:38 +0200)]
staging: rtl8723au: ioctl_cfg80211.c: Use ieee80211.h provided fctl bits

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtl8723a_cmd.c: Use ieee80211.h provided fctl bits
Jes Sorensen [Wed, 21 May 2014 12:36:48 +0000 (14:36 +0200)]
staging: rtl8723au: rtl8723a_cmd.c: Use ieee80211.h provided fctl bits

v2: Fix endian bug reported by Dan Carpenter <dan.carpenter@oracle.com>

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_xmit.c: Use IEEE80211_[FS]TYPE_ defines
Jes Sorensen [Wed, 21 May 2014 07:38:09 +0000 (09:38 +0200)]
staging: rtl8723au: rtw_xmit.c: Use IEEE80211_[FS]TYPE_ defines

In addition pkt_attrib->type a u16 and get rid of pattrib->stype

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove unused SetFrameType() macro
Jes Sorensen [Wed, 21 May 2014 07:38:08 +0000 (09:38 +0200)]
staging: rtl8723au: Remove unused SetFrameType() macro

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Get rid of obsolete SetPriority()/SetEOSP()/SetAckpolicy()
Jes Sorensen [Wed, 21 May 2014 07:38:07 +0000 (09:38 +0200)]
staging: rtl8723au: Get rid of obsolete SetPriority()/SetEOSP()/SetAckpolicy()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: _issue_qos_nulldata23a(): Use struct ieee80211_qos_hdr
Jes Sorensen [Wed, 21 May 2014 07:38:06 +0000 (09:38 +0200)]
staging: rtl8723au: _issue_qos_nulldata23a(): Use struct ieee80211_qos_hdr

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rl8723au: rtw_make_wlanhdr(): Use ieee80211_qos_hdr
Jes Sorensen [Wed, 21 May 2014 07:38:05 +0000 (09:38 +0200)]
staging: rl8723au: rtw_make_wlanhdr(): Use ieee80211_qos_hdr

Use the kernel provided struct and defines to fill in qos_ctrl

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtl8723a_cmd.c: Use ieee80211.h defines to set qos_ctrl
Jes Sorensen [Wed, 21 May 2014 07:38:04 +0000 (09:38 +0200)]
staging: rtl8723au: rtl8723a_cmd.c: Use ieee80211.h defines to set qos_ctrl

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtl8723a_update_ramask(): Get rid of annoying debug message
Jes Sorensen [Wed, 21 May 2014 07:38:03 +0000 (09:38 +0200)]
staging: rtl8723au: rtl8723a_update_ramask(): Get rid of annoying debug message

There really is no need to print this message for anyone not trying to
debug the driver:

  rtl8723a_update_ramask => mac_id:0, networkType:0x0b, mask:0x000fffff

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Get rid of SetPrivacy()/SetPwrMgt()/SetMData() macros
Jes Sorensen [Wed, 21 May 2014 07:38:02 +0000 (09:38 +0200)]
staging: rtl8723au: Get rid of SetPrivacy()/SetPwrMgt()/SetMData() macros

Set these bits directly in the code instead of fiddling with wrapper
macros.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Get rid of ugly SetDuration() macro usage
Jes Sorensen [Wed, 21 May 2014 07:38:01 +0000 (09:38 +0200)]
staging: rtl8723au: Get rid of ugly SetDuration() macro usage

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: wifi.h: Remove unused SetFragNum() macro
Jes Sorensen [Wed, 21 May 2014 07:38:00 +0000 (09:38 +0200)]
staging: rtl8723au: wifi.h: Remove unused SetFragNum() macro

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Get rid of SetSeqNum()
Jes Sorensen [Wed, 21 May 2014 07:37:59 +0000 (09:37 +0200)]
staging: rtl8723au: Get rid of SetSeqNum()

In every last use case, the header was just cleared with memset() so
there is no need to use the complex SetSeqNum() macro when
cpu_to_le16(IEEE80211_SN_TO_SEQ()) output will do just fine.

In addition, get rid of __le16 *fctrl usage when there is no need for
it.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Declare rtw_make_wlanhdr() static
Jes Sorensen [Wed, 21 May 2014 07:37:58 +0000 (09:37 +0200)]
staging: rtl8723au: Declare rtw_make_wlanhdr() static

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_make_wlanhdr23a(): Use IEEE80211_SN_TO_SEQ() to set seq_ctrl
Jes Sorensen [Wed, 21 May 2014 07:37:57 +0000 (09:37 +0200)]
staging: rtl8723au: rtw_make_wlanhdr23a(): Use IEEE80211_SN_TO_SEQ() to set seq_ctrl

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtl8723a_cmd.c: Properly initialize seq_ctrl
Jes Sorensen [Wed, 21 May 2014 07:37:56 +0000 (09:37 +0200)]
staging: rtl8723au: rtl8723a_cmd.c: Properly initialize seq_ctrl

Control frames will not be fragmented, so we should fully initialize
the seq_ctrl field to zero. This avoids leftover stack bits remaining
set in the generated frame's seq_ctrl field.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: ioctl_cfg80211.c: Properly initialize seq_ctrl
Jes Sorensen [Wed, 21 May 2014 07:37:55 +0000 (09:37 +0200)]
staging: rtl8723au: ioctl_cfg80211.c: Properly initialize seq_ctrl

Using SetSeqNum() on an uninitialized stack frame leaves us open to
leaving random fragment bits set in seq_ctrl in the frame header.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_cfg80211_inform_bss(): Use get_unaligned_le16()
Jes Sorensen [Wed, 21 May 2014 07:37:54 +0000 (09:37 +0200)]
staging: rtl8723au: rtw_cfg80211_inform_bss(): Use get_unaligned_le16()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: ioctl_cfg80211.c: Rip out < 3.14 kernel support
Jes Sorensen [Wed, 21 May 2014 07:37:53 +0000 (09:37 +0200)]
staging: rtl8723au: ioctl_cfg80211.c: Rip out < 3.14 kernel support

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: cfg80211_rtw_mgmt_tx(): type is always -1
Jes Sorensen [Wed, 21 May 2014 07:37:52 +0000 (09:37 +0200)]
staging: rtl8723au: cfg80211_rtw_mgmt_tx(): type is always -1

Rip out P2P defines since they are effectively never used.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Get rid of last HT OP mode duplicate defines
Jes Sorensen [Wed, 21 May 2014 07:37:51 +0000 (09:37 +0200)]
staging: rtl8723au: Get rid of last HT OP mode duplicate defines

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: wifi.h: Remove a pile of unused WDS_ defines
Jes Sorensen [Wed, 21 May 2014 07:37:50 +0000 (09:37 +0200)]
staging: rtl8723au: wifi.h: Remove a pile of unused WDS_ defines

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove unused enum WIFI_REG_DOMAIN
Jes Sorensen [Wed, 21 May 2014 07:37:49 +0000 (09:37 +0200)]
staging: rtl8723au: Remove unused enum WIFI_REG_DOMAIN

Must be the 17th duplicate of this list in the kernel

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Use kernel provided IEEE80211_HT_PARAM_* defines
Jes Sorensen [Wed, 21 May 2014 07:37:48 +0000 (09:37 +0200)]
staging: rtl8723au: Use kernel provided IEEE80211_HT_PARAM_* defines

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Use kernel provided IEEE80211_HT_OP_MODE_* defines
Jes Sorensen [Wed, 21 May 2014 07:37:47 +0000 (09:37 +0200)]
staging: rtl8723au: Use kernel provided IEEE80211_HT_OP_MODE_* defines

In addition remove unused HT_INFO_STBC_PARAM_* defines

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Use kernel provided WLAN_CAPABILITY_* definitions
Jes Sorensen [Wed, 21 May 2014 07:37:46 +0000 (09:37 +0200)]
staging: rtl8723au: Use kernel provided WLAN_CAPABILITY_* definitions

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: wifi.h: Remove unused SetRetry() + SetAMsdu() macros
Jes Sorensen [Wed, 21 May 2014 07:37:45 +0000 (09:37 +0200)]
staging: rtl8723au: wifi.h: Remove unused SetRetry() + SetAMsdu() macros

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Get rid of ClearMFrag/SetMFrag
Jes Sorensen [Wed, 21 May 2014 07:37:44 +0000 (09:37 +0200)]
staging: rtl8723au: Get rid of ClearMFrag/SetMFrag

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: wlan_bssdef.h: Remove some more unused #defines
Jes Sorensen [Wed, 21 May 2014 07:37:43 +0000 (09:37 +0200)]
staging: rtl8723au: wlan_bssdef.h: Remove some more unused #defines

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Get rid of struct ndis_802_11_var_ies
Jes Sorensen [Wed, 21 May 2014 07:37:42 +0000 (09:37 +0200)]
staging: rtl8723au: Get rid of struct ndis_802_11_var_ies

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtli8723au: Get rid of struct ndis_802_11_fixed_ies
Jes Sorensen [Wed, 21 May 2014 07:37:41 +0000 (09:37 +0200)]
staging: rtli8723au: Get rid of struct ndis_802_11_fixed_ies

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Get rid of struct ndis_802_11_config
Jes Sorensen [Wed, 21 May 2014 07:37:40 +0000 (09:37 +0200)]
staging: rtl8723au: Get rid of struct ndis_802_11_config

This exposed a nice endian bug in collect_bss_info23a() where two
bytes in little-endian order were copied into a u32 and afterwards
le32_to_cpu() was applied to it....

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Get rid of unused struct ndis_802_11_configuration_fh
Jes Sorensen [Wed, 21 May 2014 07:37:39 +0000 (09:37 +0200)]
staging: rtl8723au: Get rid of unused struct ndis_802_11_configuration_fh

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Make rtw_cfg80211_add_wep() take a struct rtw_wep_key
Jes Sorensen [Wed, 21 May 2014 07:37:38 +0000 (09:37 +0200)]
staging: rtl8723au: Make rtw_cfg80211_add_wep() take a struct rtw_wep_key

This allows the removal of the ugly struct ndis_8802_11_wep and simplify
rtw_cfg80211_add_wep(). In addition remove unused element ndiswep from
struct security_priv.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_cfg80211_add_wep(): Get rid of unused keyindex flags
Jes Sorensen [Wed, 21 May 2014 07:37:37 +0000 (09:37 +0200)]
staging: rtl8723au: rtw_cfg80211_add_wep(): Get rid of unused keyindex flags

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Move rtw_set_802_11_add_wep23a() to ioctl_cfg80211.c
Jes Sorensen [Wed, 21 May 2014 07:37:36 +0000 (09:37 +0200)]
staging: rtl8723au: Move rtw_set_802_11_add_wep23a() to ioctl_cfg80211.c

This is only called from ioctl_cfg80211.c so we can move it here and
declare it static.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Introduce struct rtw_wep_key to store our wep keys
Jes Sorensen [Wed, 21 May 2014 07:37:35 +0000 (09:37 +0200)]
staging: rtl8723au: Introduce struct rtw_wep_key to store our wep keys

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Use WLAN_CIPHER_SUITE_* to mark crypto type
Jes Sorensen [Wed, 21 May 2014 07:37:34 +0000 (09:37 +0200)]
staging: rtl8723au: Use WLAN_CIPHER_SUITE_* to mark crypto type

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove unused enum odm_security
Jes Sorensen [Wed, 21 May 2014 07:37:33 +0000 (09:37 +0200)]
staging: rtl8723au: Remove unused enum odm_security

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: We don't support SMS4 or WEP+WPA mixed encryption
Jes Sorensen [Wed, 21 May 2014 07:37:32 +0000 (09:37 +0200)]
staging: rtl8723au: We don't support SMS4 or WEP+WPA mixed encryption

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Store algorithm type in a u32
Jes Sorensen [Wed, 21 May 2014 07:37:31 +0000 (09:37 +0200)]
staging: rtl8723au: Store algorithm type in a u32

This will allow us to switch to using WLAN_CIPHER_SUITE_* later

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Add -Wtype-limits to CFLAGS
Jes Sorensen [Wed, 21 May 2014 07:37:30 +0000 (09:37 +0200)]
staging: rtl8723au: Add -Wtype-limits to CFLAGS

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Fix up some random bit-flag handling
Jes Sorensen [Wed, 21 May 2014 07:37:29 +0000 (09:37 +0200)]
staging: rtl8723au: Fix up some random bit-flag handling

Randomly mixing true/false/_FAIL/0/1 is a recipe for disaster

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: HalEEValueCheck(): content of a u8 is always >= 0
Jes Sorensen [Wed, 21 May 2014 07:37:28 +0000 (09:37 +0200)]
staging: rtl8723au: HalEEValueCheck(): content of a u8 is always >= 0

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Get rid of write only NetworkTypeInUse and matching enum
Jes Sorensen [Wed, 21 May 2014 07:37:27 +0000 (09:37 +0200)]
staging: rtl8723au: Get rid of write only NetworkTypeInUse and matching enum

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Use nl80211_iftype instead of driver's own custom types
Jes Sorensen [Wed, 21 May 2014 07:37:26 +0000 (09:37 +0200)]
staging: rtl8723au: Use nl80211_iftype instead of driver's own custom types

In addition move rtw_set_802_11_infrastructure_mode23a() to
ioctl_cfg80211.c and declare it static.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Fix compiling with CONFIG_8723AU_BT_COEXIST=n
Jes Sorensen [Wed, 21 May 2014 07:37:25 +0000 (09:37 +0200)]
staging: rtl8723au: Fix compiling with CONFIG_8723AU_BT_COEXIST=n

Reported-by: Jim Davis <jim.epost@gmail.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: r8192ee: Turn on build of the new driver
Larry Finger [Wed, 21 May 2014 21:25:36 +0000 (16:25 -0500)]
staging: r8192ee: Turn on build of the new driver

In addition, this commit contains a TODO file for this driver

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: r8192ee: Add the files in the rtl8192ee directory
Larry Finger [Wed, 21 May 2014 21:25:35 +0000 (16:25 -0500)]
staging: r8192ee: Add the files in the rtl8192ee directory

These files are specific to the RTL8192EE

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: r8192ee: Add code for Bluetooth coexistence
Larry Finger [Wed, 21 May 2014 21:25:34 +0000 (16:25 -0500)]
staging: r8192ee: Add code for Bluetooth coexistence

In the wireless tree, this code forms a separate mini driver. As the changes
needed for the later drivers has not yet been merged, a separate version
is needed here.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: r8192ee: Add source files for core driver
Larry Finger [Wed, 21 May 2014 21:25:33 +0000 (16:25 -0500)]
staging: r8192ee: Add source files for core driver

This part is the equivalent of rtlwifi in the wireless tree. As the changes
needed for the RTL8192EE have not yet been merged, a separate version is still
needed.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoMerge 3.15-rc6 into staging-next.
Greg Kroah-Hartman [Thu, 22 May 2014 14:27:17 +0000 (23:27 +0900)]
Merge 3.15-rc6 into staging-next.

This resolves the conflicts in the files:
drivers/iio/adc/Kconfig
drivers/staging/rtl8723au/os_dep/usb_ops_linux.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoLinux 3.15-rc6
Linus Torvalds [Wed, 21 May 2014 21:42:02 +0000 (06:42 +0900)]
Linux 3.15-rc6

10 years agoMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Linus Torvalds [Wed, 21 May 2014 20:55:12 +0000 (05:55 +0900)]
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

Pull two powerpc fixes from Ben Herrenschmidt:
 "Here are a couple of fixes for 3.15.  One from Anton fixes a nasty
  regression I introduced when trying to fix a loss of irq_work whose
  consequences is that we can completely lose timer interrupts on a
  CPU... not pretty.

  The other one is a change to our PCIe reset hook to use a firmware
  call instead of direct config space accesses to trigger a fundamental
  reset on the root port.  This is necessary so that the FW gets a
  chance to disable the link down error monitoring, which would
  otherwise trip and cause subsequent fatal EEH error"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: irq work racing with timer interrupt can result in timer interrupt hang
  powerpc/powernv: Reset root port in firmware

10 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
Linus Torvalds [Wed, 21 May 2014 20:40:13 +0000 (05:40 +0900)]
Merge branch 'for-linus' of git://git./linux/kernel/git/mason/linux-btrfs

Pull two btrfs fixes from Chris Mason:
 "This has two fixes that we've been testing for 3.16, but since both
  are safe and fix real bugs, it makes sense to send for 3.15 instead"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: send, fix incorrect ref access when using extrefs
  Btrfs: fix EIO on reading file after ioctl clone works on it

10 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
Linus Torvalds [Wed, 21 May 2014 20:38:51 +0000 (05:38 +0900)]
Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client

Pull two ceph fixes from Sage Weil:
 "The first patch fixes a problem when we have a page count of 0 for
  sendpage which is triggered by zfs.  The second fixes a bug in CRUSH
  that was resolved in the userland code a while back but fell through
  the cracks on the kernel side"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  crush: decode and initialize chooseleaf_vary_r
  libceph: fix corruption when using page_count 0 page in rbd