]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/log
mirror_ubuntu-focal-kernel.git
10 years agoStaging: iio: Removes unwanted space before semicolon
Michael Welling [Thu, 10 Apr 2014 02:26:43 +0000 (21:26 -0500)]
Staging: iio: Removes unwanted space before semicolon

Signed-off-by: Michael Welling <mwelling@ieee.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: iio: fix coding style
Joel Porquet [Wed, 9 Apr 2014 18:09:45 +0000 (20:09 +0200)]
staging: iio: fix coding style

As suggested by checkpatch.pl, use dev_info() instead of
printk(KERN_INFO ...) to print message.

Signed-off-by: Joel Porquet <joel@porquet.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: Qos: fixed braces' coding style
Luis Ortega [Wed, 9 Apr 2014 11:56:09 +0000 (13:56 +0200)]
Staging: bcm: Qos: fixed braces' coding style

Fixed badly placed and unnecessary braces.

PS: Performed as task 10 of the Eudyptula Challenge.

Signed-off-by: Luis Ortega <luiorpe1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging/bcm fix hostmibs.c checkpatch problems
Jake Edge [Fri, 4 Apr 2014 18:25:55 +0000 (12:25 -0600)]
staging/bcm fix hostmibs.c checkpatch problems

Fix 4 checkpatch errors, many warnings in bcm/hostmibs.c

Signed-off-by: Jake Edge <jake@edge2.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoStaging: bcm: CmHost: remove temp bracing from switch/cases.
Gary Rookard [Fri, 21 Mar 2014 03:28:43 +0000 (23:28 -0400)]
Staging: bcm: CmHost: remove temp bracing from switch/cases.

Remove the temp bracing afixed to case labels.

Properly indent switch/case breaks.

Signed-off-by: Gary Alan Rookard <garyrookard@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: declare das6402_boards as static
Michele Curti [Thu, 10 Apr 2014 14:38:00 +0000 (16:38 +0200)]
staging: comedi: declare das6402_boards as static

das6402_boards array is used in das6402.c only, so declare it as static.

Signed-off-by: Michele Curti <michele.curti@gmail.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: adl_pci9118: fix whitespace issues
Richard Leitner [Wed, 9 Apr 2014 16:27:13 +0000 (18:27 +0200)]
staging: comedi: adl_pci9118: fix whitespace issues

Removed not needed spaces and fixed too long lines

Signed-off-by: Richard Leitner <me@g0hl1n.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: more descriptive names for addi-data drivers
Georg Gast [Tue, 8 Apr 2014 16:52:58 +0000 (18:52 +0200)]
staging: comedi: more descriptive names for addi-data drivers

- more descriptive module description for following boards:
  ADDI-DATA APCI 1032/1500/1564/2032/3120

Signed-off-by: Georg Gast <georg@schorsch-tech.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: drivers: pcl812.c: add curly braces for checkpatch
Kumar Amit Mehta [Fri, 4 Apr 2014 15:44:44 +0000 (18:44 +0300)]
staging: comedi: drivers: pcl812.c: add curly braces for checkpatch

Kernel style is that if one side of the if else statement gets has curly
braces then both side should have them.

Signed-off-by: Kumar Amit Mehta <gmate.amit@gmail.com>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: s626: use comedi_timeout() on remaining loops
Chase Southwood [Thu, 3 Apr 2014 23:43:27 +0000 (18:43 -0500)]
staging: comedi: s626: use comedi_timeout() on remaining loops

There were just a handful of more while loops in this file that needed
timeouts, and this patch takes care of them.  One new callback is
introduced, and all of the proper comedi_timeout() calls are then used.
The return type of s626_i2c_handshake() has been changed from uint32_t to
int so that a negative error code from comedi_timeout() can be propagated
if necessary.

Signed-off-by: Chase Southwood <chase.southwood@yahoo.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: drivers.c: Fix missing a blank line, after declarations warning
Yves Deweerdt [Mon, 31 Mar 2014 20:55:44 +0000 (22:55 +0200)]
staging: comedi: drivers.c: Fix missing a blank line, after declarations warning

Signed-off-by: Yves Deweerdt <yves.deweerdt.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: comedy_fops.c: fix line over 80, characters warnings
Yves Deweerdt [Mon, 31 Mar 2014 20:55:39 +0000 (22:55 +0200)]
staging: comedi: comedy_fops.c: fix line over 80, characters warnings

Signed-off-by: Yves Deweerdt <yves.deweerdt.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: comedi: remove an unneeded variable
Dan Carpenter [Mon, 31 Mar 2014 07:50:36 +0000 (10:50 +0300)]
staging: comedi: remove an unneeded variable

"chanlist" was left over, we don't need it any more.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Simplify retrieving the ether_type in portctrl()
Jes Sorensen [Wed, 9 Apr 2014 21:21:23 +0000 (23:21 +0200)]
staging: rtl8723au: Simplify retrieving the ether_type in portctrl()

This renders the last element in include/ethernet.h unnecessary, so
remove it as well.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Calling rtw_get_stainfo() with a NULL sta_addr will return NULL
Jes Sorensen [Wed, 9 Apr 2014 21:21:22 +0000 (23:21 +0200)]
staging: rtl8723au: Calling rtw_get_stainfo() with a NULL sta_addr will return NULL

This makes the follow-on check for psta != NULL pointless and makes
the whole exercise rather pointless. This is another case of why
blindly zero-initializing variables when they are declared is bad.

This bug seems to be present in multiple drivers provided by Realtek.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Fix case where ethtype was never obtained and always be checked...
Jes Sorensen [Wed, 9 Apr 2014 21:21:21 +0000 (23:21 +0200)]
staging: rtl8723au: Fix case where ethtype was never obtained and always be checked against 0

Zero-initializing ether_type masked that the ether type would never be
obtained for 8021x packets and the comparition against eapol_type
would always fail.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Use proper ETH_P_* types in rtw_recv.c
Jes Sorensen [Wed, 9 Apr 2014 21:21:20 +0000 (23:21 +0200)]
staging: rtl8723au: Use proper ETH_P_* types in rtw_recv.c

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Call do_div() directly and get rid of unnecessary wrapper functions
Jes Sorensen [Wed, 9 Apr 2014 21:21:19 +0000 (23:21 +0200)]
staging: rtl8723au: Call do_div() directly and get rid of unnecessary wrapper functions

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Fix build error due to bad commit 6c89f82
Larry Finger [Wed, 9 Apr 2014 21:21:18 +0000 (23:21 +0200)]
staging: rtl8723au: Fix build error due to bad commit 6c89f82

Two routines are missing includes of a necessary header.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove unused bitshift() function
Jes Sorensen [Wed, 9 Apr 2014 21:21:17 +0000 (23:21 +0200)]
staging: rtl8723au: Remove unused bitshift() function

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove a couple of unused prototypes
Jes Sorensen [Wed, 9 Apr 2014 21:21:16 +0000 (23:21 +0200)]
staging: rtl8723au: Remove a couple of unused prototypes

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: No need to include header files for unused circ_buf and old iwpri...
Jes Sorensen [Wed, 9 Apr 2014 21:21:15 +0000 (23:21 +0200)]
staging: rtl8723au: No need to include header files for unused circ_buf and old iwpriv bits

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove unnecessary forward struct declarations from xmit_osdep.h
Jes Sorensen [Wed, 9 Apr 2014 21:21:14 +0000 (23:21 +0200)]
staging: rtl8723au: Remove unnecessary forward struct declarations from xmit_osdep.h

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove ugly pktfile interface
Jes Sorensen [Wed, 9 Apr 2014 21:21:13 +0000 (23:21 +0200)]
staging: rtl8723au: Remove ugly pktfile interface

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Don't use pktfile interface in rtw_xmitframe_coalesce23a()
Jes Sorensen [Wed, 9 Apr 2014 21:21:12 +0000 (23:21 +0200)]
staging: rtl8723au: Don't use pktfile interface in rtw_xmitframe_coalesce23a()

The pktfil interface is horrible, no idea where it came from, but not
using it is a win.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Make rtw_xmitframe_coalesce23a() more readable
Jes Sorensen [Wed, 9 Apr 2014 21:21:11 +0000 (23:21 +0200)]
staging: rtl8723au: Make rtw_xmitframe_coalesce23a() more readable

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Fix update_attrib() and set_qos() to not use pktfile nonsense
Jes Sorensen [Wed, 9 Apr 2014 21:21:10 +0000 (23:21 +0200)]
staging: rtl8723au: Fix update_attrib() and set_qos() to not use pktfile nonsense

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Use proper ETH_P_* types instead of hard coded constants in rtw_x...
Jes Sorensen [Wed, 9 Apr 2014 21:21:09 +0000 (23:21 +0200)]
staging: rtl8723au: Use proper ETH_P_* types instead of hard coded constants in rtw_xmit.c

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Fold rtw_remainder_len23a() into _rtw_open_pktfile23a()
Jes Sorensen [Wed, 9 Apr 2014 21:21:08 +0000 (23:21 +0200)]
staging: rtl8723au: Fold rtw_remainder_len23a() into _rtw_open_pktfile23a()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove last remnants of CONFIG_BR_EXT
Jes Sorensen [Wed, 9 Apr 2014 21:21:07 +0000 (23:21 +0200)]
staging: rtl8723au: Remove last remnants of CONFIG_BR_EXT

Reported-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_report_sec_ie23a() is only called from rtw_mlme.c
Jes Sorensen [Wed, 9 Apr 2014 21:21:06 +0000 (23:21 +0200)]
staging: rtl8723au: rtw_report_sec_ie23a() is only called from rtw_mlme.c

Move it there 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: Remove unused functions rtw_indicate_sta_{dis,}assoc_event23a()
Jes Sorensen [Wed, 9 Apr 2014 21:21:05 +0000 (23:21 +0200)]
staging: rtl8723au: Remove unused functions rtw_indicate_sta_{dis,}assoc_event23a()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Fix hopeless brackets for declaring a variable mid-function
Jes Sorensen [Wed, 9 Apr 2014 21:21:04 +0000 (23:21 +0200)]
staging: rtl8723au: Fix hopeless brackets for declaring a variable mid-function

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove unnecessary memset() followed by a memcpy() into the same...
Jes Sorensen [Wed, 9 Apr 2014 21:21:03 +0000 (23:21 +0200)]
staging: rtl8723au: Remove unnecessary memset() followed by a memcpy() into the same space

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: rtw_os_indicate_connect23a() is only called from one place -...
Jes Sorensen [Wed, 9 Apr 2014 21:21:02 +0000 (23:21 +0200)]
staging: rtl8723au: rtw_os_indicate_connect23a() is only called from one place - fold it in

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Don't wrap kill_pid() in an unnecessary macro
Jes Sorensen [Wed, 9 Apr 2014 21:21:01 +0000 (23:21 +0200)]
staging: rtl8723au: Don't wrap kill_pid() in an unnecessary macro

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove two layers of wrappers around rtw_cfg80211_indicate_scan_d...
Jes Sorensen [Wed, 9 Apr 2014 21:21:00 +0000 (23:21 +0200)]
staging: rtl8723au: Remove two layers of wrappers around rtw_cfg80211_indicate_scan_done()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove #ifdef CONFIG_DEBUG_CFG80211
Jes Sorensen [Wed, 9 Apr 2014 21:20:59 +0000 (23:20 +0200)]
staging: rtl8723au: Remove #ifdef CONFIG_DEBUG_CFG80211

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove unused is_boot_from_eeprom() macro
Jes Sorensen [Wed, 9 Apr 2014 21:20:58 +0000 (23:20 +0200)]
staging: rtl8723au: Remove unused is_boot_from_eeprom() macro

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove obsolete HW_VARIABLES enum
Jes Sorensen [Wed, 9 Apr 2014 21:20:57 +0000 (23:20 +0200)]
staging: rtl8723au: Remove obsolete HW_VARIABLES enum

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Kill off ugly GetHwReg*() interface
Jes Sorensen [Wed, 9 Apr 2014 21:20:56 +0000 (23:20 +0200)]
staging: rtl8723au: Kill off ugly GetHwReg*() interface

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eliminate HW_WAR_CHK_HI_QUEUE_EMPTY usage
Jes Sorensen [Wed, 9 Apr 2014 21:20:55 +0000 (23:20 +0200)]
staging: rtl8723au: Eliminate HW_WAR_CHK_HI_QUEUE_EMPTY usage

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eliminate HW_VAR_FWLPS_RF_ON usage
Jes Sorensen [Wed, 9 Apr 2014 21:20:54 +0000 (23:20 +0200)]
staging: rtl8723au: Eliminate HW_VAR_FWLPS_RF_ON usage

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eliminate HW_VAR_RF_TYPE usage
Jes Sorensen [Wed, 9 Apr 2014 21:20:53 +0000 (23:20 +0200)]
staging: rtl8723au: Eliminate HW_VAR_RF_TYPE usage

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Improve some bad switch() formatting
Jes Sorensen [Wed, 9 Apr 2014 21:20:52 +0000 (23:20 +0200)]
staging: rtl8723au: Improve some bad switch() formatting

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove empty function rtw_stassoc_hw_rpt23a()
Jes Sorensen [Wed, 9 Apr 2014 21:20:51 +0000 (23:20 +0200)]
staging: rtl8723au: Remove empty function rtw_stassoc_hw_rpt23a()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove SetHwReg*() related code
Jes Sorensen [Wed, 9 Apr 2014 21:20:50 +0000 (23:20 +0200)]
staging: rtl8723au: Remove SetHwReg*() related code

Remove all references to this odd mux/demux pseudo hw register
handling code.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove calls to HW_VAR_H2C_MEDIA_STATUS
Jes Sorensen [Wed, 9 Apr 2014 21:20:49 +0000 (23:20 +0200)]
staging: rtl8723au: Remove calls to HW_VAR_H2C_MEDIA_STATUS

This call was unhandled, so these calls were effectively a no-op

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eliminate unused HW_VAR_TRIGGER_GPIO_0
Jes Sorensen [Wed, 9 Apr 2014 21:20:48 +0000 (23:20 +0200)]
staging: rtl8723au: Eliminate unused HW_VAR_TRIGGER_GPIO_0

... and related functions

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove HW_VAR_TXPAUSE
Jes Sorensen [Wed, 9 Apr 2014 21:20:47 +0000 (23:20 +0200)]
staging: rtl8723au: Remove HW_VAR_TXPAUSE

This wasn't used at all

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove HW_VAR_EFUSE_{BT_,}BYTES
Jes Sorensen [Wed, 9 Apr 2014 21:20:46 +0000 (23:20 +0200)]
staging: rtl8723au: Remove HW_VAR_EFUSE_{BT_,}BYTES

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove HW_VAR_APFM_ON_MAC
Jes Sorensen [Wed, 9 Apr 2014 21:20:45 +0000 (23:20 +0200)]
staging: rtl8723au: Remove HW_VAR_APFM_ON_MAC

None of this was ever used, so pull it out together with related variables

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eliminate HW_VAR_DM_FLAG
Jes Sorensen [Wed, 9 Apr 2014 21:20:44 +0000 (23:20 +0200)]
staging: rtl8723au: Eliminate HW_VAR_DM_FLAG

Both the read and write calls were never used

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eliminate HW_VAR_DM_FUNC_{SET,CLR}
Jes Sorensen [Wed, 9 Apr 2014 21:20:43 +0000 (23:20 +0200)]
staging: rtl8723au: Eliminate HW_VAR_DM_FUNC_{SET,CLR}

Unroll two layers of mux/demux in the call chain for each.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eliminate HW_VAR_DM_FUNC_OP calls
Jes Sorensen [Wed, 9 Apr 2014 21:20:42 +0000 (23:20 +0200)]
staging: rtl8723au: Eliminate HW_VAR_DM_FUNC_OP calls

Demux the code and remove multiple call layers

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Make direct calls for HW_VAR_NAV_UPPER
Jes Sorensen [Wed, 9 Apr 2014 21:20:41 +0000 (23:20 +0200)]
staging: rtl8723au: Make direct calls for HW_VAR_NAV_UPPER

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove commented out set_hwreg calls
Jes Sorensen [Wed, 9 Apr 2014 21:20:40 +0000 (23:20 +0200)]
staging: rtl8723au: Remove commented out set_hwreg calls

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Make direct calls for HW_VAR_SET_RPWM
Jes Sorensen [Wed, 9 Apr 2014 21:20:39 +0000 (23:20 +0200)]
staging: rtl8723au: Make direct calls for HW_VAR_SET_RPWM

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Make direct calls for HW_VAR_H2C_P2P_PS_OFFLOAD
Jes Sorensen [Wed, 9 Apr 2014 21:20:38 +0000 (23:20 +0200)]
staging: rtl8723au: Make direct calls for HW_VAR_H2C_P2P_PS_OFFLOAD

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Make direct calls for HW_VAR_H2C_FW_{PWRMODE,JOINBSSRPT}
Jes Sorensen [Wed, 9 Apr 2014 21:20:37 +0000 (23:20 +0200)]
staging: rtl8723au: Make direct calls for HW_VAR_H2C_FW_{PWRMODE,JOINBSSRPT}

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Make direct calls for HW_VAR_TXDMA_AGG_PG_TH
Jes Sorensen [Wed, 9 Apr 2014 21:20:36 +0000 (23:20 +0200)]
staging: rtl8723au: Make direct calls for HW_VAR_TXDMA_AGG_PG_TH

This was in fact turned into a no-op for the RTL8723AU, but it looks
like a bug, so this reenables it.

Keep an eye out for side-effects here and revert this, if it causes
issues.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Nuke HW_VAR_CHECK_TXBUF, which was also a no-op
Jes Sorensen [Wed, 9 Apr 2014 21:20:35 +0000 (23:20 +0200)]
staging: rtl8723au: Nuke HW_VAR_CHECK_TXBUF, which was also a no-op

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Nuke HW_VAR_BCN_FUNC
Jes Sorensen [Wed, 9 Apr 2014 21:20:34 +0000 (23:20 +0200)]
staging: rtl8723au: Nuke HW_VAR_BCN_FUNC

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Kill off HW_VAR_INITIAL_GAIN
Jes Sorensen [Wed, 9 Apr 2014 21:20:33 +0000 (23:20 +0200)]
staging: rtl8723au: Kill off HW_VAR_INITIAL_GAIN

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Make direct calls for HW_VAR_AMPDU_{MIN_SPACE,FACTOR}
Jes Sorensen [Wed, 9 Apr 2014 21:20:32 +0000 (23:20 +0200)]
staging: rtl8723au: Make direct calls for HW_VAR_AMPDU_{MIN_SPACE,FACTOR}

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Kill off HW_VAR_ACM_CTRL
Jes Sorensen [Wed, 9 Apr 2014 21:20:31 +0000 (23:20 +0200)]
staging: rtl8723au: Kill off HW_VAR_ACM_CTRL

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eiminate the use of HW_VAR_AC_PARAM_{VO,VI,BE,BK}
Jes Sorensen [Wed, 9 Apr 2014 21:20:30 +0000 (23:20 +0200)]
staging: rtl8723au: Eiminate the use of HW_VAR_AC_PARAM_{VO,VI,BE,BK}

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eliminate HW_VAR_CAM_WRITE and clean up all the wrapping around it
Jes Sorensen [Wed, 9 Apr 2014 21:20:29 +0000 (23:20 +0200)]
staging: rtl8723au: Eliminate HW_VAR_CAM_WRITE and clean up all the wrapping around it

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Kill off HW_VAR_CAM_EMPTY_ENTRY and some function layers wrapping it
Jes Sorensen [Wed, 9 Apr 2014 21:20:28 +0000 (23:20 +0200)]
staging: rtl8723au: Kill off HW_VAR_CAM_EMPTY_ENTRY and some function layers wrapping it

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eliminate HW_VAR_SEC_CFG usage
Jes Sorensen [Wed, 9 Apr 2014 21:20:27 +0000 (23:20 +0200)]
staging: rtl8723au: Eliminate HW_VAR_SEC_CFG usage

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eliminate HW_VAR_ACK_PREAMBLE
Jes Sorensen [Wed, 9 Apr 2014 21:20:26 +0000 (23:20 +0200)]
staging: rtl8723au: Eliminate HW_VAR_ACK_PREAMBLE

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eliminate HW_VAR_RESP_SIFS
Jes Sorensen [Wed, 9 Apr 2014 21:20:25 +0000 (23:20 +0200)]
staging: rtl8723au: Eliminate HW_VAR_RESP_SIFS

Yet another case of an endian bug from treating a 32 bit integer as an
array of 8 bit numbers...

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eliminate HW_VAR_SLOT_TIME
Jes Sorensen [Wed, 9 Apr 2014 21:20:24 +0000 (23:20 +0200)]
staging: rtl8723au: Eliminate HW_VAR_SLOT_TIME

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eliminate HW_VAR_BEACON_INTERVAL
Jes Sorensen [Wed, 9 Apr 2014 21:20:23 +0000 (23:20 +0200)]
staging: rtl8723au: Eliminate HW_VAR_BEACON_INTERVAL

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eliminate HW_VAR_CHECK_BSSID and HW_VAR_MLME_JOIN
Jes Sorensen [Wed, 9 Apr 2014 21:20:22 +0000 (23:20 +0200)]
staging: rtl8723au: Eliminate HW_VAR_CHECK_BSSID and HW_VAR_MLME_JOIN

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eliminate HW_VAR_MLME_SITESURVEY usage
Jes Sorensen [Wed, 9 Apr 2014 21:20:21 +0000 (23:20 +0200)]
staging: rtl8723au: Eliminate HW_VAR_MLME_SITESURVEY usage

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eliminate HW_VAR_BSSID usage
Jes Sorensen [Wed, 9 Apr 2014 21:20:20 +0000 (23:20 +0200)]
staging: rtl8723au: Eliminate HW_VAR_BSSID usage

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eliminate HW_VAR_MAC_ADDR usage
Jes Sorensen [Wed, 9 Apr 2014 21:20:19 +0000 (23:20 +0200)]
staging: rtl8723au: Eliminate HW_VAR_MAC_ADDR usage

.... and rip out a couple of unnecessary layers of function calls

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eliminate usage of HW_VAR_BASIC_RATE
Jes Sorensen [Wed, 9 Apr 2014 21:20:18 +0000 (23:20 +0200)]
staging: rtl8723au: Eliminate usage of HW_VAR_BASIC_RATE

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Eliminate HW_VAR_SET_OPMODE usage
Jes Sorensen [Wed, 9 Apr 2014 21:20:17 +0000 (23:20 +0200)]
staging: rtl8723au: Eliminate HW_VAR_SET_OPMODE usage

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove HW_VAR_MEDIA_STATUS* usage
Jes Sorensen [Wed, 9 Apr 2014 21:20:16 +0000 (23:20 +0200)]
staging: rtl8723au: Remove HW_VAR_MEDIA_STATUS* usage

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: This gets rid of the last HW_VAR_BCN_VALID usage
Jes Sorensen [Wed, 9 Apr 2014 21:20:15 +0000 (23:20 +0200)]
staging: rtl8723au: This gets rid of the last HW_VAR_BCN_VALID usage

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agostaging: rtl8723au: Remove a bunch of calls via indirect HAL interface and call funct...
Jes Sorensen [Wed, 9 Apr 2014 21:20:14 +0000 (23:20 +0200)]
staging: rtl8723au: Remove a bunch of calls via indirect HAL interface and call functions directly

The 'HW' variable interface is confusing and simply obfuscates the
code, so this is the first patch in a series to remove it and make
direct calls to the functions in place.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 years agoLinux 3.15-rc1
Linus Torvalds [Sun, 13 Apr 2014 21:18:35 +0000 (14:18 -0700)]
Linux 3.15-rc1

10 years agomm: Initialize error in shmem_file_aio_read()
Geert Uytterhoeven [Sun, 13 Apr 2014 18:46:22 +0000 (20:46 +0200)]
mm: Initialize error in shmem_file_aio_read()

Some versions of gcc even warn about it:

  mm/shmem.c: In function ‘shmem_file_aio_read’:
  mm/shmem.c:1414: warning: ‘error’ may be used uninitialized in this function

If the loop is aborted during the first iteration by one of the two
first break statements, error will be uninitialized.

Introduced by commit 6e58e79db8a1 ("introduce copy_page_to_iter, kill
loop over iovec in generic_file_aio_read()").

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agocifs: Use min_t() when comparing "size_t" and "unsigned long"
Geert Uytterhoeven [Sun, 13 Apr 2014 18:46:21 +0000 (20:46 +0200)]
cifs: Use min_t() when comparing "size_t" and "unsigned long"

On 32 bit, size_t is "unsigned int", not "unsigned long", causing the
following warning when comparing with PAGE_SIZE, which is always "unsigned
long":

  fs/cifs/file.c: In function ‘cifs_readdata_to_iov’:
  fs/cifs/file.c:2757: warning: comparison of distinct pointer types lacks a cast

Introduced by commit 7f25bba819a3 ("cifs_iovec_read: keep iov_iter
between the calls of cifs_readdata_to_iov()"), which changed the
signedness of "remaining" and the code from min_t() to min().

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agoMerge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
Linus Torvalds [Sun, 13 Apr 2014 20:28:13 +0000 (13:28 -0700)]
Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux

Pull slab changes from Pekka Enberg:
 "The biggest change is byte-sized freelist indices which reduces slab
  freelist memory usage:

    https://lkml.org/lkml/2013/12/2/64"

* 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
  mm: slab/slub: use page->list consistently instead of page->lru
  mm/slab.c: cleanup outdated comments and unify variables naming
  slab: fix wrongly used macro
  slub: fix high order page allocation problem with __GFP_NOFAIL
  slab: Make allocations with GFP_ZERO slightly more efficient
  slab: make more slab management structure off the slab
  slab: introduce byte sized index for the freelist of a slab
  slab: restrict the number of objects in a slab
  slab: introduce helper functions to get/set free object
  slab: factor out calculate nr objects in cache_estimate

10 years agoMerge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Linus Torvalds [Sun, 13 Apr 2014 01:22:27 +0000 (18:22 -0700)]
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull misc kbuild changes from Michal Marek:
 "Here is the non-critical part of kbuild:
   - One bogus coccinelle check removed, one check fixed not to suggest
     the obsolete PTR_RET macro
   - scripts/tags.sh does not index the generated *.mod.c files
   - new objdiff tool to list differences between two versions of an
     object file
   - A fix for scripts/bootgraph.pl"

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  scripts/coccinelle: Use PTR_ERR_OR_ZERO
  scripts/bootgraph.pl: Add graphic header
  scripts: objdiff: detect object code changes between two commits
  Coccicheck: Remove memcpy to struct assignment test
  scripts/tags.sh: Ignore *.mod.c

10 years agosym53c8xx_2: Set DID_REQUEUE return code when aborting squeue
Mikulas Patocka [Wed, 9 Apr 2014 01:52:05 +0000 (21:52 -0400)]
sym53c8xx_2: Set DID_REQUEUE return code when aborting squeue

This patch fixes I/O errors with the sym53c8xx_2 driver when the disk
returns QUEUE FULL status.

When the controller encounters an error (including QUEUE FULL or BUSY
status), it aborts all not yet submitted requests in the function
sym_dequeue_from_squeue.

This function aborts them with DID_SOFT_ERROR.

If the disk has full tag queue, the request that caused the overflow is
aborted with QUEUE FULL status (and the scsi midlayer properly retries
it until it is accepted by the disk), but the sym53c8xx_2 driver aborts
the following requests with DID_SOFT_ERROR --- for them, the midlayer
does just a few retries and then signals the error up to sd.

The result is that disk returning QUEUE FULL causes request failures.

The error was reproduced on 53c895 with COMPAQ BD03685A24 disk
(rebranded ST336607LC) with command queue 48 or 64 tags.  The disk has
64 tags, but under some access patterns it return QUEUE FULL when there
are less than 64 pending tags.  The SCSI specification allows returning
QUEUE FULL anytime and it is up to the host to retry.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agopowerpc: Don't try to set LPCR unless we're in hypervisor mode
Paul Mackerras [Fri, 11 Apr 2014 06:43:35 +0000 (16:43 +1000)]
powerpc: Don't try to set LPCR unless we're in hypervisor mode

Commit 8f619b5429d9 ("powerpc/ppc64: Do not turn AIL (reloc-on
interrupts) too early") added code to set the AIL bit in the LPCR
without checking whether the kernel is running in hypervisor mode.  The
result is that when the kernel is running as a guest (i.e., under
PowerKVM or PowerVM), the processor takes a privileged instruction
interrupt at that point, causing a panic.  The visible result is that
the kernel hangs after printing "returning from prom_init".

This fixes it by checking for hypervisor mode being available before
setting LPCR.  If we are not in hypervisor mode, we enable relocation-on
interrupts later in pSeries_setup_arch using the H_SET_MODE hcall.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agofutex: update documentation for ordering guarantees
Davidlohr Bueso [Wed, 9 Apr 2014 18:55:07 +0000 (11:55 -0700)]
futex: update documentation for ordering guarantees

Commits 11d4616bd07f ("futex: revert back to the explicit waiter
counting code") and 69cd9eba3886 ("futex: avoid race between requeue and
wake") changed some of the finer details of how we think about futexes.
One was a late fix and the other a consequence of overlooking the whole
requeuing logic.

The first change caused our documentation to be incorrect, and the
second made us aware that we need to explicitly add more details to it.

Signed-off-by: Davidlohr Bueso <davidlohr@hp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Linus Torvalds [Sun, 13 Apr 2014 00:31:22 +0000 (17:31 -0700)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Pull yet more networking updates from David Miller:

 1) Various fixes to the new Redpine Signals wireless driver, from
    Fariya Fatima.

 2) L2TP PPP connect code takes PMTU from the wrong socket, fix from
    Dmitry Petukhov.

 3) UFO and TSO packets differ in whether they include the protocol
    header in gso_size, account for that in skb_gso_transport_seglen().
   From Florian Westphal.

 4) If VLAN untagging fails, we double free the SKB in the bridging
    output path.  From Toshiaki Makita.

 5) Several call sites of sk->sk_data_ready() were referencing an SKB
    just added to the socket receive queue in order to calculate the
    second argument via skb->len.  This is dangerous because the moment
    the skb is added to the receive queue it can be consumed in another
    context and freed up.

    It turns out also that none of the sk->sk_data_ready()
    implementations even care about this second argument.

    So just kill it off and thus fix all these use-after-free bugs as a
    side effect.

 6) Fix inverted test in tcp_v6_send_response(), from Lorenzo Colitti.

 7) pktgen needs to do locking properly for LLTX devices, from Daniel
    Borkmann.

 8) xen-netfront driver initializes TX array entries in RX loop :-) From
    Vincenzo Maffione.

 9) After refactoring, some tunnel drivers allow a tunnel to be
    configured on top itself.  Fix from Nicolas Dichtel.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (46 commits)
  vti: don't allow to add the same tunnel twice
  gre: don't allow to add the same tunnel twice
  drivers: net: xen-netfront: fix array initialization bug
  pktgen: be friendly to LLTX devices
  r8152: check RTL8152_UNPLUG
  net: sun4i-emac: add promiscuous support
  net/apne: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
  net: ipv6: Fix oif in TCP SYN+ACK route lookup.
  drivers: net: cpsw: enable interrupts after napi enable and clearing previous interrupts
  drivers: net: cpsw: discard all packets received when interface is down
  net: Fix use after free by removing length arg from sk_data_ready callbacks.
  Drivers: net: hyperv: Address UDP checksum issues
  Drivers: net: hyperv: Negotiate suitable ndis version for offload support
  Drivers: net: hyperv: Allocate memory for all possible per-pecket information
  bridge: Fix double free and memory leak around br_allowed_ingress
  bonding: Remove debug_fs files when module init fails
  i40evf: program RSS LUT correctly
  i40evf: remove open-coded skb_cow_head
  ixgb: remove open-coded skb_cow_head
  igbvf: remove open-coded skb_cow_head
  ...

10 years agoMerge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realm...
Linus Torvalds [Sun, 13 Apr 2014 00:26:45 +0000 (17:26 -0700)]
Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux

Pull blackfin updates from Steven Miao:
 "Code cleanup, some previously ignored patches, and bug fixes"

* tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
  blackfin: cleanup board files
  bf609: clock: drop unused clock bit set/clear functions
  Blackfin: bf537: rename "CONFIG_ADT75"
  Blackfin: bf537: rename "CONFIG_AD7314"
  Blackfin: bf537: rename ad2s120x ->ad2s1200
  blackfin: bf537: fix typo "CONFIG_SND_SOC_ADV80X_MODULE"
  blackfin: dma: current count mmr is read only
  bfin_crc: Move architecture independant crc header file out of the blackfin folder.
  bf54x: drop unuesd HOST status,control,timeout registers bit define macros
  blackfin: portmux: cleanup head file
  Blackfin: remove "config IP_CHECKSUM_L1"
  blackfin: Remove GENERIC_GPIO config option again
  blackfin:Use generic /proc/interrupts implementation
  blackfin: bf60x: fix typo "CONFIG_PM_BFIN_WAKE_PA15_POL"

10 years agoMerge tag 'remoteproc-3.15-cleanups' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Sun, 13 Apr 2014 00:23:12 +0000 (17:23 -0700)]
Merge tag 'remoteproc-3.15-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc

Pull remoteproc cleanups from Ohad Ben-Cohen:
 "Several remoteproc cleanup patches coming from Jingoo Han, Julia
  Lawall and Uwe Kleine-König"

* tag 'remoteproc-3.15-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
  remoteproc/ste_modem: staticize local symbols
  remoteproc/davinci: simplify use of devm_ioremap_resource
  remoteproc/davinci: drop needless devm_clk_put

10 years agoMerge tag 'llvmlinux-for-v3.15' of git://git.linuxfoundation.org/llvmlinux/kernel
Linus Torvalds [Sun, 13 Apr 2014 00:00:40 +0000 (17:00 -0700)]
Merge tag 'llvmlinux-for-v3.15' of git://git.linuxfoundation.org/llvmlinux/kernel

Pull llvm patches from Behan Webster:
 "These are some initial updates to support compiling the kernel with
  clang.

  These patches have been through the proper reviews to the best of my
  ability, and have been soaking in linux-next for a few weeks.  These
  patches by themselves still do not completely allow clang to be used
  with the kernel code, but lay the foundation for other patches which
  are still under review.

  Several other of the LLVMLinux patches have been already added via
  maintainer trees"

* tag 'llvmlinux-for-v3.15' of git://git.linuxfoundation.org/llvmlinux/kernel:
  x86: LLVMLinux: Fix "incomplete type const struct x86cpu_device_id"
  x86 kbuild: LLVMLinux: More cc-options added for clang
  x86, acpi: LLVMLinux: Remove nested functions from Thinkpad ACPI
  LLVMLinux: Add support for clang to compiler.h and new compiler-clang.h
  LLVMLinux: Remove warning about returning an uninitialized variable
  kbuild: LLVMLinux: Fix LINUX_COMPILER definition script for compilation with clang
  Documentation: LLVMLinux: Update Documentation/dontdiff
  kbuild: LLVMLinux: Adapt warnings for compilation with clang
  kbuild: LLVMLinux: Add Kbuild support for building kernel with Clang

10 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...
Linus Torvalds [Sat, 12 Apr 2014 23:51:08 +0000 (16:51 -0700)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

Pull SCSI target updates from Nicholas Bellinger:
 "Here are the target pending updates for v3.15-rc1.  Apologies in
  advance for waiting until the second to last day of the merge window
  to send these out.

  The highlights this round include:

   - iser-target support for T10 PI (DIF) offloads (Sagi + Or)
   - Fix Task Aborted Status (TAS) handling in target-core (Alex Leung)
   - Pass in transport supported PI at session initialization (Sagi + MKP + nab)
   - Add WRITE_INSERT + READ_STRIP T10 PI support in target-core (nab + Sagi)
   - Fix iscsi-target ERL=2 ASYNC_EVENT connection pointer bug (nab)
   - Fix tcm_fc use-after-free of ft_tpg (Andy Grover)
   - Use correct ib_sg_dma primitives in ib_isert (Mike Marciniszyn)

  Also, note the virtio-scsi + vhost-scsi changes to expose T10 PI
  metadata into KVM guest have been left-out for now, as there where a
  few comments from MST + Paolo that where not able to be addressed in
  time for v3.15.  Please expect this feature for v3.16-rc1"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (43 commits)
  ib_srpt: Use correct ib_sg_dma primitives
  target/tcm_fc: Rename ft_tport_create to ft_tport_get
  target/tcm_fc: Rename ft_{add,del}_lport to {add,del}_wwn
  target/tcm_fc: Rename structs and list members for clarity
  target/tcm_fc: Limit to 1 TPG per wwn
  target/tcm_fc: Don't export ft_lport_list
  target/tcm_fc: Fix use-after-free of ft_tpg
  target: Add check to prevent Abort Task from aborting itself
  target: Enable READ_STRIP emulation in target_complete_ok_work
  target/sbc: Add sbc_dif_read_strip software emulation
  target: Enable WRITE_INSERT emulation in target_execute_cmd
  target/sbc: Add sbc_dif_generate software emulation
  target/sbc: Only expose PI read_cap16 bits when supported by fabric
  target/spc: Only expose PI mode page bits when supported by fabric
  target/spc: Only expose PI inquiry bits when supported by fabric
  target: Pass in transport supported PI at session initialization
  target/iblock: Fix double bioset_integrity_free bug
  Target/sbc: Initialize COMPARE_AND_WRITE write_sg scatterlist
  target/rd: T10-Dif: RAM disk is allocating more space than required.
  iscsi-target: Fix ERL=2 ASYNC_EVENT connection pointer bug
  ...

10 years agoMerge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
Linus Torvalds [Sat, 12 Apr 2014 23:18:17 +0000 (16:18 -0700)]
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:
 "A series of bug fix patches for v3.15-rc1.  Most are just driver
  fixes.  There are some changes at remote controller core level, fixing
  some definitions on a new API added for Kernel v3.15.

  It also adds the missing include at include/uapi/linux/v4l2-common.h,
  to allow its compilation on userspace, as pointed by you"

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (24 commits)
  [media] gpsca: remove the risk of a division by zero
  [media] stk1160: warrant a NUL terminated string
  [media] v4l: ti-vpe: retain v4l2_buffer flags for captured buffers
  [media] v4l: ti-vpe: Set correct field parameter for output and capture buffers
  [media] v4l: ti-vpe: zero out reserved fields in try_fmt
  [media] v4l: ti-vpe: Fix initial configuration queue data
  [media] v4l: ti-vpe: Use correct bus_info name for the device in querycap
  [media] v4l: ti-vpe: report correct capabilities in querycap
  [media] v4l: ti-vpe: Allow usage of smaller images
  [media] v4l: ti-vpe: Use video_device_release_empty
  [media] v4l: ti-vpe: Make sure in job_ready that we have the needed number of dst_bufs
  [media] lgdt3305: include sleep functionality in lgdt3304_ops
  [media] drx-j: use customise option correctly
  [media] m88rs2000: fix sparse static warnings
  [media] r820t: fix size and init values
  [media] rc-core: remove generic scancode filter
  [media] rc-core: split dev->s_filter
  [media] rc-core: do not change 32bit NEC scancode format for now
  [media] rtl28xxu: remove duplicate ID 0458:707f Genius TVGo DVB-T03
  [media] xc2028: add missing break to switch
  ...

10 years agoMerge tag 'ntb-3.15' of git://github.com/jonmason/ntb
Linus Torvalds [Sat, 12 Apr 2014 23:16:39 +0000 (16:16 -0700)]
Merge tag 'ntb-3.15' of git://github.com/jonmason/ntb

Pull PCIe non-transparent bridge fixes and features from Jon Mason:
 "NTB driver bug fixes to address issues in list traversal, skb leak in
  ntb_netdev, a typo, and a leak of msix entries in the error path.
  Clean ups of the event handling logic, as well as a overall style
  cleanup.  Finally, the driver was converted to use the new
  pci_enable_msix_range logic (and the refactoring to go along with it)"

* tag 'ntb-3.15' of git://github.com/jonmason/ntb:
  ntb: Use pci_enable_msix_range() instead of pci_enable_msix()
  ntb: Split ntb_setup_msix() into separate BWD/SNB routines
  ntb: Use pci_msix_vec_count() to obtain number of MSI-Xs
  NTB: Code Style Clean-up
  NTB: client event cleanup
  ntb: Fix leakage of ntb_device::msix_entries[] array
  NTB: Fix typo in setting one translation register
  ntb_netdev: Fix skb free issue in open
  ntb_netdev: Fix list_for_each_entry exit issue

10 years agoceph: fix pr_fmt() redefinition
Linus Torvalds [Sat, 12 Apr 2014 22:39:53 +0000 (15:39 -0700)]
ceph: fix pr_fmt() redefinition

The vfs merge caused a latent bug to show up:

   In file included from fs/ceph/super.h:4:0,
                    from fs/ceph/ioctl.c:3:
   include/linux/ceph/ceph_debug.h:4:0: warning: "pr_fmt" redefined [enabled by default]
    #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
    ^
   In file included from include/linux/kernel.h:13:0,
                    from include/linux/uio.h:12,
                    from include/linux/socket.h:7,
                    from include/uapi/linux/in.h:22,
                    from include/linux/in.h:23,
                    from fs/ceph/ioctl.c:1:
   include/linux/printk.h:214:0: note: this is the location of the previous definition
    #define pr_fmt(fmt) fmt
    ^

where the reason is that <linux/ceph_debug.h> is included much too late
for the "pr_fmt()" define.

The include of <linux/ceph_debug.h> needs to be the first include in the
file, but fs/ceph/ioctl.c had for some reason missed that, and it wasn't
noticeable until some unrelated header file changes brought in an
indirect earlier include of <linux/kernel.h>.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Linus Torvalds [Sat, 12 Apr 2014 21:49:50 +0000 (14:49 -0700)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs updates from Al Viro:
 "The first vfs pile, with deep apologies for being very late in this
  window.

  Assorted cleanups and fixes, plus a large preparatory part of iov_iter
  work.  There's a lot more of that, but it'll probably go into the next
  merge window - it *does* shape up nicely, removes a lot of
  boilerplate, gets rid of locking inconsistencie between aio_write and
  splice_write and I hope to get Kent's direct-io rewrite merged into
  the same queue, but some of the stuff after this point is having
  (mostly trivial) conflicts with the things already merged into
  mainline and with some I want more testing.

  This one passes LTP and xfstests without regressions, in addition to
  usual beating.  BTW, readahead02 in ltp syscalls testsuite has started
  giving failures since "mm/readahead.c: fix readahead failure for
  memoryless NUMA nodes and limit readahead pages" - might be a false
  positive, might be a real regression..."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (63 commits)
  missing bits of "splice: fix racy pipe->buffers uses"
  cifs: fix the race in cifs_writev()
  ceph_sync_{,direct_}write: fix an oops on ceph_osdc_new_request() failure
  kill generic_file_buffered_write()
  ocfs2_file_aio_write(): switch to generic_perform_write()
  ceph_aio_write(): switch to generic_perform_write()
  xfs_file_buffered_aio_write(): switch to generic_perform_write()
  export generic_perform_write(), start getting rid of generic_file_buffer_write()
  generic_file_direct_write(): get rid of ppos argument
  btrfs_file_aio_write(): get rid of ppos
  kill the 5th argument of generic_file_buffered_write()
  kill the 4th argument of __generic_file_aio_write()
  lustre: don't open-code kernel_recvmsg()
  ocfs2: don't open-code kernel_recvmsg()
  drbd: don't open-code kernel_recvmsg()
  constify blk_rq_map_user_iov() and friends
  lustre: switch to kernel_sendmsg()
  ocfs2: don't open-code kernel_sendmsg()
  take iov_iter stuff to mm/iov_iter.c
  process_vm_access: tidy up a bit
  ...