linux-stable.git/drivers/staging/rtl8192e, branch linux-3.9.y

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-01-15T20:05:59+00:00

Conflicts:
	Documentation/networking/ip-sysctl.txt
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

Both conflicts were simply overlapping context.

A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.

Signed-off-by: David S. Miller

staging: rtl8192e: Fix failure to check pci_map_single()

2013-01-07T20:57:27+00:00

Beginning with kernel 3.8, the DMA mapping routines issue a warning
for the first call to pci_map_single() that is not checked with a
pci_dma_mapping_error() call.

Signed-off-by: Larry Finger 
Signed-off-by: Greg Kroah-Hartman

ethtool: fix drvinfo strings set in drivers

2013-01-07T05:06:31+00:00

Use strlcpy where possible to ensure the string is \0 terminated.
Use always sizeof(string) instead of 32, ETHTOOL_BUSINFO_LEN
and custom defines.
Use snprintf instead of sprint.
Remove unnecessary inits of ->fw_version
Remove unnecessary inits of drvinfo struct.

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

staging: rtl8192e: remove use of __devexit

2012-11-21T22:07:42+00:00

CONFIG_HOTPLUG is going away as an option so __devexit is no
longer needed.

Signed-off-by: Bill Pemberton 
Signed-off-by: Greg Kroah-Hartman

staging: rtl8192e: remove use of __devinitdata

2012-11-21T22:07:42+00:00

CONFIG_HOTPLUG is going away as an option so __devinitdata is no
longer needed.

Signed-off-by: Bill Pemberton 
Signed-off-by: Greg Kroah-Hartman

staging: rtl8192e: remove use of __devinit

2012-11-21T22:07:42+00:00

CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.

Signed-off-by: Bill Pemberton 
Signed-off-by: Greg Kroah-Hartman

staging: rtl8192e: remove use of __devexit_p

2012-11-21T22:07:42+00:00

CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer
needed.

Signed-off-by: Bill Pemberton 
Signed-off-by: Greg Kroah-Hartman

staging: rtl8192e: rtl8192e: rtl_core.c: Audit the return value of register_netdev()

2012-11-15T23:26:14+00:00

Inspect the return value of register_netdev() in the driver probe routine and
return -ENODEV in case of error.

Signed-off-by: Kumar Amit Mehta 
Signed-off-by: Greg Kroah-Hartman

Staging: rtl8192e: rtllib_tx.c: fixed an asterisk coding style issue

2012-10-31T22:14:41+00:00

Fixed coding style issue

Signed-off-by: Edgar Neukirchner 
Signed-off-by: Greg Kroah-Hartman

staging/rtl8192e: Fix compile warning 'is static but declared in .. which is not static'

2012-10-29T22:01:01+00:00

When compiling this driver I get these compile warnings:

rtllib.h:2573:2: warning: '______f' is static but declared in inline
function 'rtllib_is_empty_essid' which is not static [enabled by
default]
rtllib.h:2579:3: warning: '______f' is static but declared in inline
function 'rtllib_is_empty_essid' which is not static [enabled by
default]
rtllib.h:2594:2: warning: '______f' is static but declared in inline
function 'rtllib_is_valid_mode' which is not static [enabled by default]
rtllib.h:2599:2: warning: '______f' is static but declared in inline
function 'rtllib_is_valid_mode' which is not static [enabled by default]
rtllib.h:2604:2: warning: '______f' is static but declared in inline
function 'rtllib_is_valid_mode' which is not static [enabled by default]
rtllib.h:2618:3: warning: '______f' is static but declared in inline
function 'rtllib_get_hdrlen' which is not static [enabled by default]
rtllib.h:2620:3: warning: '______f' is static but declared in inline
function 'rtllib_get_hdrlen' which is not static [enabled by default]

These functions are declared as extern inline but not 'overloaded'
anywhere so we can declare them static inline and get rid of the
warnings.

Signed-off-by: Peter Huewe 
Signed-off-by: Greg Kroah-Hartman