Commit Graph

247 Commits

Author SHA1 Message Date
Larry Finger
33c84bc14c staging: r8188eu: 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 comparison against eapol_type
would always fail.

Reported-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-16 13:07:19 -07:00
Larry Finger
9452bf5602 staging: r8188eu: 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.

Reported-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-16 11:46:18 -07:00
Wilfried Klaebe
ec03ab77cc staging: rtl8188eu: remove spaces, correct counts to unbreak P2P ioctls
staging: rtl8188eu: remove spaces, correct counts to unbreak P2P ioctls

It looks like someone did a search-and-replace on that driver, putting
spaces before "=" characters, without checking this is OK everywhere.
Also, in some places, there's memcpm()s/strncmp()s checking for some
different length than the fixed string argument.

These things result in code not working as intended. Fix that.

Signed-off-by: Wilfried Klaebe <w-lkml@lebenslange-mailadresse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-15 13:52:14 -07:00
Linus Torvalds
159d8133d0 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
 "Usual rocket science -- mostly documentation and comment updates"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  sparse: fix comment
  doc: fix double words
  isdn: capi: fix "CAPI_VERSION" comment
  doc: DocBook: Fix typos in xml and template file
  Bluetooth: add module name for btwilink
  driver core: unexport static function create_syslog_header
  mmc: core: typo fix in printk specifier
  ARM: spear: clean up editing mistake
  net-sysfs: fix comment typo 'CONFIG_SYFS'
  doc: Insert MODULE_ in module-signing macros
  Documentation: update URL to hfsplus Technote 1150
  gpio: update path to documentation
  ixgbe: Fix format string in ixgbe_fcoe.
  Kconfig: Remove useless "default N" lines
  user_namespace.c: Remove duplicated word in comment
  CREDITS: fix formatting
  treewide: Fix typo in Documentation/DocBook
  mm: Fix warning on make htmldocs caused by slab.c
  ata: ata-samsung_cf: cleanup in header file
  idr: remove unused prototype of idr_free()
2014-04-02 16:23:38 -07:00
Elena Oat
9cdddda572 Staging: rtl8188eu: Fix warning of braces are not necessary.
This patch fixes the warning of "braces are not necessary for single
statement blocks" in file rtw_ieee80211.c.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:13:37 -07:00
Elena Oat
5366f6f685 Staging: rtl8188eu: Fix warning of space prohibited.
This patch fixes the warning of "space prohibited before semicolon" in
file rtw_efuse.c.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:13:37 -07:00
Elena Oat
bd18b0abc8 Staging: rtl8188eu: Fix warning of braces not necessary.
This small patch fixes the warning of "braces are
necessary for any arm of this statement" in file rtw_efuse.c.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:13:37 -07:00
Elena Oat
c6f5fbcd55 Staging: rtl8188eu: Fix warnings of no space before tabs.
This patch fixes the warning of "please, no space before tabs" in file
rtw_efuse.c. I have also modified the style of the comments for
readability.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:10:26 -07:00
Elena Oat
2275d2b763 Staging: rtl8188eu: Fix warning of space prohibited.
This small patch fixes the warning of "space prohibited before
semicolon" in file rtw_debug.c.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:10:26 -07:00
Chi Pham
792f32ac64 staging: rtl8188eu: Reduced nesting and improved coding style.
Signed-off-by: Chi Pham <fempsci@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:10:26 -07:00
Elena Oat
9137c9df5e Staging: rtl8188eu: Fix warnings of no space before tabs.
This patch fixes the warnings of "please, no space before tabs" in the
file rtw_mlme.c. I have also modified the comment style and removed some
unnecessary tabs.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:01:49 -07:00
Elena Oat
b4ed18b1df Staging: rtl8188eu: Fix warnings of space prohibited.
This patch fixes the warnings of "space prohibited between function name
and open parenthesis" in file rtw_mlme.c.

While at it, I have also removed unneccessary tabs. Also one comment
that didn't make sense was removed.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Acked-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:01:49 -07:00
Elena Oat
a318c9e0f4 Staging: rtl8188eu: Fix warning of braces {} are not necessary.
This patch fixes the warning of "braces {} are not necessary for single
statement blocks" in file rtw_mlme.c. I have removed the else statement
in one case, as it didn't have any value.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:01:49 -07:00
Elena Oat
1bdbd758c8 Staging: rtl8188eu: Fix warning of printk() should include KERN_ facility level.
This patch fixes the warning of "printk() should include KERN_ facility
level" in file rtw_debug.c.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18 12:22:48 -07:00
Elena Oat
f12919d5c9 Staging: rtl8188eu: Fix warning of unchecked sscanf return value.
This patch fixes the warning "unchecked sscanf return value" in file
rtw_mp.c. Zero is returned in case sscanf fails or if less than expected
items are read and assigned successfully. I have decided to return zero,
because in previous conditional statements zero was returned in case of
failure.

While at it, I have also fixed the warning of line over 80
characters.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18 12:22:21 -07:00
Himangi Saraogi
6624ad1560 staging:rtl8188eu: Remove unnecessary variable assignments
This patch removes unnecessary variable assignments which are
assigned immediately after the first initialization.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18 10:49:41 -07:00
Chi Pham
fb0a1bb293 staging:rtl8188eu: Removed assignments in if statements.
Fixed some indentation to silence (some) checkpatch errors.
The following coccinelle script found the match:

@@
expression E0, E1, E2;
statement S0, S1;
@@
- if ((E1 = E2) != E)
+ E1 = E2;
+ if (E1 != E)
S1 else S2

Signed-off-by: Chi Pham <fempsci@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18 10:46:37 -07:00
Elena Oat
b6657bfb48 Staging: rtl8188eu: Replace rtw_zmalloc with kzalloc.
This patch replaces rtw_zmalloc with kzalloc in function
rtw_setstandby_cmd. There are no locks, hence GFP_KERNEL flag is used.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-18 10:46:37 -07:00
Fengguang Wu
19485a6dbd staging: r8188eu: fix coccinelle warnings
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:8030:3-9: Replace memcpy with struct assignment

Generated by: coccinelle/misc/memcpy-assign.cocci

Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-17 14:50:46 -07:00
Elena Oat
160eaf20a8 Staging: rtl8188eu: Fix sparse warnings.
This patch fixes following warnings produced by sparse:

drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3867:31:    expected void
const *<noident>
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3867:31:    got void
[noderef] <asn:1>*pointer
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3869:38: warning:
incorrect type in argument 1 (different address spaces)
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3869:38:    expected void
const *<noident>
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3869:38:    got void
[noderef] <asn:1>*pointer
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3871:38: warning:
incorrect type in argument 1 (different address spaces)
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3871:38:    expected void
const *<noident>
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3871:38:    got void
[noderef] <asn:1>*pointer
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3873:38: warning:
incorrect type in argument 1 (different address spaces)
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3873:38:    expected void
const *<noident>
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3873:38:    got void
[noderef] <asn:1>*pointer
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3875:38: warning:
incorrect type in argument 1 (different address spaces)
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3875:38:    expected void
const *<noident>
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3875:38:    got void
[noderef] <asn:1>*pointer
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3878:38: warning:
incorrect type in argument 1 (different address spaces)
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3878:38:    expected void
const *<noident>
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3878:38:    got void
[noderef] <asn:1>*pointer
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3880:38: warning:
incorrect type in argument 1 (different address spaces)
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3880:38:    expected void
const *<noident>
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3880:38:    got void
[noderef] <asn:1>*pointer
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3883:38: warning:
incorrect type in argument 1 (different address spaces)
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3883:38:    expected void const *<noident>
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3883:38:    got void
[noderef] <asn:1>*pointer
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:3897:9: warning: cast
removes address space of expression

While at it, I have also fixed the warnings of lines over 80 characters.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-13 16:49:19 -07:00
Kristina Martšenko
b812982e6b staging: rtl8188eu: explicitly convert from __le16 to integer
BA_para_set (of type __le16) is implicitly cast into an integer for
bitwise operations, after which the result is converted back into a
__le16. Make the initial cast explicit to make the code clearer. In
addition, refactor the code for readability.

This also removes five sparse warnings of the following type:
drivers/staging/rtl8188eu//core/rtw_mlme_ext.c:6114:70: warning: restricted __le16 degrades to integer

Signed-off-by: Kristina Martšenko <kristina.martsenko@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-13 16:24:19 -07:00
Elena Oat
2a8efee2c7 Staging: rtl8188eu: Fix warning of unchecked sscanf return value.
This patch fixes the warnings produced by checkpatch "unchecked sscanf
return value" in file ioctl_linux.c.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2014-03-13 16:06:31 -07:00
Elena Oat
ba5be64678 Staging: rtl8188eu: Fix warning of prefer ether_addr_copy.
This patch fixes the warning of "Prefer ether_addr_copy() over memcpy()
if the Ethernet addresses are __aligned(2)" in file rtw_cmd.c. Pahole
shows that the addresses are 2-byte aligned.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-07 14:47:39 -08:00
Elena Oat
dc29fcae7a Staging: rtl8188eu: Fix warning of suspect code indent.
This patch fixes the warning of "suspect code indent for conditional
statements" in file rtw_cmd.c. I have removed the conditional statements
in two places altogether, as it didn't bring any value.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-07 14:47:03 -08:00
Elena Oat
719e897cf1 Staging: rtl8188eu: Fix warning of space prohibited before semicolon.
This patch fixes the warning of "space prohibited before semicolon" in file rtw_cmd.c.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-07 14:47:03 -08:00
Elena Oat
440dacdf6c Staging: rtl8188eu: Fix warning of unnecessary parentheses.
This patch fixes the warning of "unnecessary parentheses" in file rtw_cmd.c.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-07 14:47:03 -08:00
Elena Oat
cc96a42891 Staging: rtl8188eu: Fix warning of space before tabs.
This patch fixes the warning of "please, no space before tabs" in file
rtw_cmd.c. I have also removed couple of lines of code that was
commented and probably left from the previous version.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-07 14:47:03 -08:00
Elena Oat
7c3000c377 Staging: rtl8188eu: Fix warning of spaces at the start of a line.
This patch fixes the warning of "please, no spaces at the start of a
line" in file rtw_cmd.c.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-07 14:47:03 -08:00
Elena Oat
8ee6421b6c Staging: rtl8188eu: Fix warning braces {} are not necessary.
This patch fixes the warning of "braces {} are not necessary for single
statement blocks" in file rtw_cmd.c.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-07 14:46:31 -08:00
Monam Agarwal
c6b2dcdc8b Staging: rtl8188eu: Fix sparse warning cast to restricted __le16
This patch fixes the following sparse warnings:
drivers/staging/rtl8188eu/core/rtw_wlan_util.c:1627:25: warning: cast to restricted __le16
by changing the annotations in the struct declaration.

Signed-off-by: Monam Agarwal <monamagarwal123@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-07 14:44:04 -08:00
Elena Oat
29698f1e9d Staging: rtl8188eu: Fix warning of printk should include KERN_.
This patch fixes the warning produced by checkpatch of "printk should
include KERN_ facility level". printk was replaced by netdev_info. While
at it, I have also fixed the line over 80 characters warning.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-07 14:44:04 -08:00
Elena Oat
48e7124179 Staging: rtl8188eu: Fix warning of prefer ether_addr_copy().
This patch fixes the warning produced by checkpatch "Prefer
ether_addr_copy() over memcpy() if the Ethernet addresses are
__aligned(2)". The address that is copied is a field of
nat25_network_db_entry structure. Definition for this struct is found in
rtw_br_ext.h file. Pahole shows that the addresses are 2-byte aligned.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-07 14:44:04 -08:00
Elena Oat
2c05f00f88 Staging: rtl8188eu: Fix warning of braces {} are not necessary.
This patch fixes the warning of "braces {} are not necessary for any arm
of this statement" in file rtw_ioctl_set.c. The braces are removed in
three places.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-07 14:44:04 -08:00
Ebru Akagunduz
6fb081577f Staging:rtl8188eu: fix kfree(NULL) is safe this check is probably not required in rtw_ap.c
Fix checkpatch.pl issues with kfree(NULL) is safe this
check is probably not required in rtw_ap.c

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-07 14:42:24 -08:00
Elena Oat
73e183426f Staging: rtl8188eu: Fix warning of kfree check is not required.
This patch fixes the warning produced by checkpatch in the file
rtw_cmd.c "kfree(NULL) is safe this check is probably not required". The
patch fixes it in two places for this file.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-07 14:34:12 -08:00
Elena Oat
138050a2d7 Staging: rtl8188eu: Fix warning of no space before tabs.
This patch fixes the warning of "Please, no space before tab" produced
by checkpatch.pl. The modified file: rtw_cmd.c.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-07 14:34:12 -08:00
Elena Oat
867892f372 Staging: rtl8188eu: Fix the warning of space before parenthesis.
This patch fixes the warning of "space prohibited between function name
and open parenthesis '('". The modified file: rtw_cmd.c. The patch also
removes some strange spaces that were generated probably by some editor.

Signed-off-by: Elena Oat <oat.elena@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-07 14:34:12 -08:00
Greg Kroah-Hartman
17b02809cf Merge 3.14-rc5 into staging-next
We want those fixes in here
2014-03-02 20:12:54 -08:00
Masanari Iida
40a46d8b40 staging: rtl8188eu: Fix typo in rtl8188eu/core
Fix spelling typo in comments and printk within
rtl8188eu/core

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-27 15:12:11 -08:00
Manu Gupta
260ea9c2e2 staging: r8188eu: Add new device ID
The D-Link DWA-123 REV D1 with USB ID 2001:3310 uses this driver.

Signed-off-by: Manu Gupta <manugupt1@gmail.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-24 17:02:31 -08:00
Greg Kroah-Hartman
b42060069f Merge 3.14-rc4 into staging-next.
We want those fixes here as well.
2014-02-24 12:33:52 -08:00
Jiri Kosina
d4263348f7 Merge branch 'master' into for-next 2014-02-20 14:54:28 +01:00
Paul Bolle
c7dcec7dd4 Kconfig: Remove useless "default N" lines
A number of Kconfig entries default to (uppercase) "N". It was clearly
intended to use "default n". But since (lowercase) "n" is the default
anyway, these lines might as well be removed.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2014-02-20 14:38:06 +01:00
Linus Torvalds
b0d3f6d47e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller:

 1) kvaser CAN driver has fixed limits of some of it's table, validate
    that we won't exceed those limits at probe time.  Fix from Olivier
    Sobrie.

 2) Fix rtl8192ce disabling interrupts for too long, from Olivier
    Langlois.

 3) Fix botched shift in ath5k driver, from Dan Carpenter.

 4) Fix corruption of deferred packets in TIPC, from Erik Hugne.

 5) Fix newlink error path in macvlan driver, from Cong Wang.

 6) Fix netpoll deadlock in bonding, from Ding Tianhong.

 7) Handle GSO packets properly in forwarding path when fragmentation is
    necessary on egress, from Florian Westphal.

 8) Fix axienet build errors, from Michal Simek.

 9) Fix refcounting of ubufs on tx in vhost net driver, from Michael S
    Tsirkin.

10) Carrier status isn't set properly in hyperv driver, from Haiyang
    Zhang.

11) Missing pci_disable_device() in tulip_remove_one), from Ingo Molnar.

12) AF_PACKET qdisc bypass mode doesn't adhere to driver provided TX
    queue selection method.  Add a fallback method mechanism to fix this
    bug, from Daniel Borkmann.

13) Fix regression in link local route handling on GRE tunnels, from
    Nicolas Dichtel.

14) Bonding can assign dup aggregator IDs in some sequences of
    configuration, fix by making the allocation counter per-bond instead
    of global.  From Jiri Bohac.

15) sctp_connectx() needs compat translations, from Daniel Borkmann.

16) Fix of_mdio PHY interrupt parsing, from Ben Dooks

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (62 commits)
  MAINTAINERS: add entry for the PHY library
  of_mdio: fix phy interrupt passing
  net: ethernet: update dependency and help text of mvneta
  NET: fec: only enable napi if we are successful
  af_packet: remove a stray tab in packet_set_ring()
  net: sctp: fix sctp_connectx abi for ia32 emulation/compat mode
  ipv4: fix counter in_slow_tot
  irtty-sir.c: Do not set_termios() on irtty_close()
  bonding: 802.3ad: make aggregator_identifier bond-private
  usbnet: remove generic hard_header_len check
  gre: add link local route when local addr is any
  batman-adv: fix potential kernel paging error for unicast transmissions
  batman-adv: avoid double free when orig_node initialization fails
  batman-adv: free skb on TVLV parsing success
  batman-adv: fix TT CRC computation by ensuring byte order
  batman-adv: fix potential orig_node reference leak
  batman-adv: avoid potential race condition when adding a new neighbour
  batman-adv: properly check pskb_may_pull return value
  batman-adv: release vlan object after checking the CRC
  batman-adv: fix TT-TVLV parsing on OGM reception
  ...
2014-02-18 15:52:43 -08:00
Daniel Borkmann
99932d4fc0 netdevice: add queue selection fallback handler for ndo_select_queue
Add a new argument for ndo_select_queue() callback that passes a
fallback handler. This gets invoked through netdev_pick_tx();
fallback handler is currently __netdev_pick_tx() as most drivers
invoke this function within their customized implementation in
case for skbs that don't need any special handling. This fallback
handler can then be replaced on other call-sites with different
queue selection methods (e.g. in packet sockets, pktgen etc).

This also has the nice side-effect that __netdev_pick_tx() is
then only invoked from netdev_pick_tx() and export of that
function to modules can be undone.

Suggested-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-17 00:36:34 -05:00
Stas Sergeev
60800abdc1 staging: r8188eu: Make firmware buffer persistent
The present code reloads the firmware file from the disk every time the interface
re-inits. Change to hold the firmware in memory, and only download to the
device.

Signed-off-by: Stas Sergeev <stsp@users.sourceforge.net>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-15 12:40:19 -08:00
Larry Finger
f87028f42f staging: r8188eu: Remove wrapper routine _set_workitem()
This is simply a wrapper around schedule_work().

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-15 12:40:19 -08:00
Larry Finger
1781709bc3 staging: r8188eu: Remove wrapper routine _init_workitem()
This is simply another name for INIT_WORK().

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-15 12:39:27 -08:00
Larry Finger
8117253c45 staging: r8188eu: Remove wrapper _exit_critical_mutex()
This wrapper is a simple call to mutex_exit().

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-15 12:38:57 -08:00
Larry Finger
88faf1b3bb staging: r8188eu: Remove unused union
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-15 12:36:16 -08:00