linux-stable.git/drivers/staging/vt6655, branch v3.2

Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2011-10-26T13:39:02+00:00

* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits)
  staging: et131x: Remove redundant check and return statement
  staging: et131x: Mainly whitespace changes to appease checkpatch
  staging: et131x: Remove last of the forward declarations
  staging: et131x: Remove even more forward declarations
  staging: et131x: Remove yet more forward declarations
  staging: et131x: Remove more forward declarations
  staging: et131x: Remove forward declaration of et131x_adapter_setup
  staging: et131x: Remove some forward declarations
  staging: et131x: Remove unused rx_ring.recv_packet_pool
  staging: et131x: Remove call to find pci pm capability
  staging: et131x: Remove redundant et131x_reset_recv() call
  staging: et131x: Remove unused rx_ring.recv_buffer_pool
  Staging: bcm: Fix three initialization errors in InterfaceDld.c
  Staging: bcm: Fix coding style issues in InterfaceDld.c
  staging:iio:dac: Add AD5360 driver
  staging:iio:trigger:bfin-timer: Fix compile error
  Staging: vt6655: add some range checks before memcpy()
  Staging: vt6655: whitespace fixes to iotcl.c
  Staging: vt6656: add some range checks before memcpy()
  Staging: vt6656: whitespace cleanups in ioctl.c
  ...

Fix up conflicts in:
 - drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}:
	vg driver movement
 - drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}:
	driver removal vs now stale changes
 - drivers/staging/rtl8192e/r8192E_core.c:
	driver removal vs now stale changes
 - drivers/staging/et131x/et131*:
	driver consolidation into one file, tried to do fixups

Staging: vt6655: add some range checks before memcpy()

2011-10-23T08:13:20+00:00

There were no range checks in the original code so the user could
write past the end of the array.

Signed-off-by: Dan Carpenter 
Signed-off-by: Greg Kroah-Hartman

Staging: vt6655: whitespace fixes to iotcl.c

2011-10-23T08:13:20+00:00

The indents didn't line up at all in the original code.  I also fixed
a bunch of other white issues as I went along.  I changed the comment
style and removed some commented out code.

Signed-off-by: Dan Carpenter 
Signed-off-by: Greg Kroah-Hartman

Staging: vt6655: memory corruption in check in wpa_set_wpadev()

2011-10-19T20:42:48+00:00

The original code left it up to the user to decide how much data to
copy, but that doesn't work with a fixed size array.

Signed-off-by: Dan Carpenter 
Signed-off-by: Greg Kroah-Hartman

Staging: vt6655-6: potential info leak in private_ioctl()

2011-09-27T00:43:44+00:00

Smatch has a new check for Rosenberg type information leaks where
structs are copied to the user with uninitialized stack data in them.

In this path, the .uLinkRate member doesn't get initialized so I've
set it to zero.

Signed-off-by: Dan Carpenter 
Signed-off-by: Greg Kroah-Hartman

staging: vt6655: simplify MAC printing by using %pM

2011-08-23T21:36:17+00:00

Signed-off-by: Andy Shevchenko 
Signed-off-by: Greg Kroah-Hartman

staging: vt6655: Fixed all the indents and other errors in IEEE11h.c

2011-08-23T20:27:28+00:00

Signed-off-by: Toon Schoenmakers 
Signed-off-by: Greg Kroah-Hartman

net: remove use of ndo_set_multicast_list in drivers

2011-08-18T03:22:03+00:00

replace it by ndo_set_rx_mode

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

staging: vt6655: Fix warnings if CONFIG_PM is not defined

2011-05-06T16:27:34+00:00

If staging:vt6655 is built without CONFIG_DM being defined, there are large
numbers of warnings of the following form due to use of #if instead of #ifdef:

In file included from drivers/staging/vt6655/upc.h:32,
                 from drivers/staging/vt6655/mac.h:39,
                 from drivers/staging/vt6655/wroute.c:34:
drivers/staging/vt6655/device.h:399:5: warning: "CONFIG_PM" is not defined

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

staging: Remove unnecessary semicolons when switch (foo) {...};

2011-04-25T23:58:35+00:00

Done via perl script:

$ cat remove_semi_switch.pl
my $match_balanced_parentheses = qr/(\((?:[^\(\)]++|(?-1))*\))/;
my $match_balanced_braces      = qr/(\{(?:[^\{\}]++|(?-1))*\})/;

foreach my $file (@ARGV) {
    my $f;
    my $text;
    my $oldtext;

    next if ((-d $file));

    open($f, '<', $file)
	or die "$P: Can't open $file for read\n";
    $oldtext = do { local($/) ; <$f> };
    close($f);

    next if ($oldtext eq "");

    $text = $oldtext;

    my $count = 0;
    do {
	$count = 0;
	$count += $text =~ s@\b(switch\s*${match_balanced_parentheses}\s*)${match_balanced_braces}\s*;@"$1$3"@egx;
    } while ($count > 0);

    if ($text ne $oldtext) {
	my $newfile = $file;

	open($f, '>', $newfile)
	    or die "$P: Can't open $newfile for write\n";
	print $f $text;
	close($f);
    }
}

$

Signed-off-by: Joe Perches 
Signed-off-by: Greg Kroah-Hartman