Commit 0e90ed0e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (24 commits)
  usbnet: Remove over-broad module alias from zaurus.
  MAINTAINERS: drop Michael from bfin_mac driver
  net/can: activate bit-timing calculation and netlink based drivers by default
  rionet: fix NULL pointer dereference in rionet_remove
  net+crypto: Use vmalloc for zlib inflate buffers.
  netfilter: Fix ip_route_me_harder triggering ip_rt_bug
  ipv4: Fix IPsec slowpath fragmentation problem
  ipv4: Fix packet size calculation in __ip_append_data
  cxgb3: skb_record_rx_queue now records the queue index relative to the net_device.
  bridge: Only flood unregistered groups to routers
  qlge: Add maintainer.
  MAINTAINERS: mark socketcan-core lists as subscribers-only
  MAINTAINERS: Remove Sven Eckelmann from BATMAN ADVANCED
  r8169: fix wrong register use.
  net/usb/kalmia: signedness bug in kalmia_bind()
  net/usb: kalmia: Various fixes for better support of non-x86 architectures.
  rtl8192cu: Fix missing firmware load
  udp/recvmsg: Clear MSG_TRUNC flag when starting over for a new packet
  ipv6/udp: Use the correct variable to determine non-blocking condition
  netconsole: fix build when CONFIG_NETCONSOLE_DYNAMIC is turned on
  ...
parents 5fc3054d 16adf5d0

MAINTAINERS

+3 −4
Original line number Diff line number Diff line
@@ -1392,7 +1392,6 @@ F: include/linux/backlight.h 
BATMAN ADVANCED

M:	Marek Lindner <lindner_marek@yahoo.de>

M:	Simon Wunderlich <siwu@hrz.tu-chemnitz.de>

M:	Sven Eckelmann <sven@narfation.org>

L:	b.a.t.m.a.n@lists.open-mesh.org

W:	http://www.open-mesh.org/

S:	Maintained
@@ -1425,7 +1424,6 @@ S: Supported 
F:	arch/blackfin/



BLACKFIN EMAC DRIVER

M:	Michael Hennerich <michael.hennerich@analog.com>

L:	uclinux-dist-devel@blackfin.uclinux.org

W:	http://blackfin.uclinux.org

S:	Supported
@@ -1641,7 +1639,7 @@ CAN NETWORK LAYER 
M:	Oliver Hartkopp <socketcan@hartkopp.net>

M:	Oliver Hartkopp <oliver.hartkopp@volkswagen.de>

M:	Urs Thuermann <urs.thuermann@volkswagen.de>

L:	socketcan-core@lists.berlios.de

L:	socketcan-core@lists.berlios.de (subscribers-only)

L:	netdev@vger.kernel.org

W:	http://developer.berlios.de/projects/socketcan/

S:	Maintained
@@ -1653,7 +1651,7 @@ F: include/linux/can/raw.h 


CAN NETWORK DRIVERS

M:	Wolfgang Grandegger <wg@grandegger.com>

L:	socketcan-core@lists.berlios.de

L:	socketcan-core@lists.berlios.de (subscribers-only)

L:	netdev@vger.kernel.org

W:	http://developer.berlios.de/projects/socketcan/

S:	Maintained
@@ -5183,6 +5181,7 @@ S: Supported 
F:	drivers/net/qlcnic/



QLOGIC QLGE 10Gb ETHERNET DRIVER

M:	Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>

M:	Ron Mercer <ron.mercer@qlogic.com>

M:	linux-driver@qlogic.com

L:	netdev@vger.kernel.org

crypto/deflate.c

+3 −4
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <linux/interrupt.h>

#include <linux/mm.h>

#include <linux/net.h>

#include <linux/slab.h>



#define DEFLATE_DEF_LEVEL		Z_DEFAULT_COMPRESSION

#define DEFLATE_DEF_WINBITS		11
@@ -73,7 +72,7 @@ static int deflate_decomp_init(struct deflate_ctx *ctx) 
	int ret = 0;

	struct z_stream_s *stream = &ctx->decomp_stream;



	stream->workspace = kzalloc(zlib_inflate_workspacesize(), GFP_KERNEL);

	stream->workspace = vzalloc(zlib_inflate_workspacesize());

	if (!stream->workspace) {

		ret = -ENOMEM;

		goto out;
@@ -86,7 +85,7 @@ static int deflate_decomp_init(struct deflate_ctx *ctx) 
out:

	return ret;

out_free:

	kfree(stream->workspace);

	vfree(stream->workspace);

	goto out;

}
@@ -99,7 +98,7 @@ static void deflate_comp_exit(struct deflate_ctx *ctx) 
static void deflate_decomp_exit(struct deflate_ctx *ctx)

{

	zlib_inflateEnd(&ctx->decomp_stream);

	kfree(ctx->decomp_stream.workspace);

	vfree(ctx->decomp_stream.workspace);

}



static int deflate_init(struct crypto_tfm *tfm)

crypto/zlib.c

+3 −4
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/interrupt.h>

#include <linux/mm.h>

#include <linux/net.h>

#include <linux/slab.h>



#include <crypto/internal/compress.h>
@@ -60,7 +59,7 @@ static void zlib_decomp_exit(struct zlib_ctx *ctx) 


	if (stream->workspace) {

		zlib_inflateEnd(stream);

		kfree(stream->workspace);

		vfree(stream->workspace);

		stream->workspace = NULL;

	}

}
@@ -228,13 +227,13 @@ static int zlib_decompress_setup(struct crypto_pcomp *tfm, void *params, 
				 ? nla_get_u32(tb[ZLIB_DECOMP_WINDOWBITS])

				 : DEF_WBITS;



	stream->workspace = kzalloc(zlib_inflate_workspacesize(), GFP_KERNEL);

	stream->workspace = vzalloc(zlib_inflate_workspacesize());

	if (!stream->workspace)

		return -ENOMEM;



	ret = zlib_inflateInit2(stream, ctx->decomp_windowBits);

	if (ret != Z_OK) {

		kfree(stream->workspace);

		vfree(stream->workspace);

		stream->workspace = NULL;

		return -EINVAL;

	}

drivers/net/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -3416,7 +3416,8 @@ config NETCONSOLE 


config NETCONSOLE_DYNAMIC

	bool "Dynamic reconfiguration of logging targets"

	depends on NETCONSOLE && SYSFS && CONFIGFS_FS

	depends on NETCONSOLE && SYSFS && CONFIGFS_FS && \

			!(NETCONSOLE=y && CONFIGFS_FS=m)

	help

	  This option enables the ability to dynamically reconfigure target

	  parameters (interface, IP addresses, port numbers, MAC addresses)

drivers/net/bnx2x/bnx2x_main.c

+3 −3
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <linux/zlib.h>

#include <linux/io.h>

#include <linux/stringify.h>

#include <linux/vmalloc.h>



#define BNX2X_MAIN

#include "bnx2x.h"
@@ -4537,8 +4538,7 @@ static int bnx2x_gunzip_init(struct bnx2x *bp) 
	if (bp->strm  == NULL)

		goto gunzip_nomem2;



	bp->strm->workspace = kmalloc(zlib_inflate_workspacesize(),

				      GFP_KERNEL);

	bp->strm->workspace = vmalloc(zlib_inflate_workspacesize());

	if (bp->strm->workspace == NULL)

		goto gunzip_nomem3;
@@ -4562,7 +4562,7 @@ gunzip_nomem1: 
static void bnx2x_gunzip_end(struct bnx2x *bp)

{

	if (bp->strm) {

		kfree(bp->strm->workspace);

		vfree(bp->strm->workspace);

		kfree(bp->strm);

		bp->strm = NULL;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE