Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9539ce22 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  forcedeth: fix cpu irq mask
  chelsio parenthesis fix
  spidernet: skb used after netif_receive_skb
  meth driver renovation
  remove unnecessary dependency on VIA velocity config
  fix compiler warning in fixed.c
  asix.c - Add Belkin F5D5055 ids
  ucc_geth:trivial fix
  ucc_geth: Fix MODULE_DEVICE_TABLE() duplication
  [PATCH] drivers/net/wireless/libertas/rx.c: fix use-after-free
  [PATCH] drivers/net/wireless/libertas/fw.c: fix use-before-check
  [PATCH] libertas: skb dereferenced after netif_rx
parents c2b38989 096a458c

arch/mips/sgi-ip32/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ 
# under Linux.

#



obj-y	+= ip32-berr.o ip32-irq.o ip32-setup.o ip32-reset.o \

obj-y	+= ip32-berr.o ip32-irq.o ip32-platform.o ip32-setup.o ip32-reset.o \

	   crime.o ip32-memory.o

arch/mips/sgi-ip32/ip32-platform.c

0 → 100644
+20 −0
Original line number Diff line number Diff line 
#include <linux/init.h>

#include <linux/platform_device.h>



static __init int meth_devinit(void)

{

	struct platform_device *pd;

	int ret;



	pd = platform_device_alloc("meth", -1);

	if (!pd)

		return -ENOMEM;



	ret = platform_device_add(pd);

	if (ret)

		platform_device_put(pd);



	return ret;

}



device_initcall(meth_devinit);

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2218,7 +2218,7 @@ config SK98LIN 


config VIA_VELOCITY

	tristate "VIA Velocity support"

	depends on NET_PCI && PCI

	depends on PCI

	select CRC32

	select CRC_CCITT

	select MII

drivers/net/chelsio/suni1x10gexp_regs.h

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ 
#define mSUNI1x10GEXP_REG_RXXG_EXACT_MATCH_ADDR_LOW(filterId) (0x204A + mSUNI1x10GEXP_MAC_FILTER_OFFSET(filterId))

#define mSUNI1x10GEXP_REG_RXXG_EXACT_MATCH_ADDR_MID(filterId) (0x204B + mSUNI1x10GEXP_MAC_FILTER_OFFSET(filterId))

#define mSUNI1x10GEXP_REG_RXXG_EXACT_MATCH_ADDR_HIGH(filterId)(0x204C + mSUNI1x10GEXP_MAC_FILTER_OFFSET(filterId))

#define mSUNI1x10GEXP_REG_RXXG_EXACT_MATCH_VID(filterId)      (0x2062 + mSUNI1x10GEXP_MAC_VID_FILTER_OFFSET(filterId)

#define mSUNI1x10GEXP_REG_RXXG_EXACT_MATCH_VID(filterId)      (0x2062 + mSUNI1x10GEXP_MAC_VID_FILTER_OFFSET(filterId))

#define SUNI1x10GEXP_REG_RXXG_EXACT_MATCH_ADDR_0_LOW                     0x204A

#define SUNI1x10GEXP_REG_RXXG_EXACT_MATCH_ADDR_0_MID                     0x204B

#define SUNI1x10GEXP_REG_RXXG_EXACT_MATCH_ADDR_0_HIGH                    0x204C

drivers/net/forcedeth.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ enum { 
#define NVREG_IRQ_TX_FORCED		0x0100

#define NVREG_IRQ_RECOVER_ERROR		0x8000

#define NVREG_IRQMASK_THROUGHPUT	0x00df

#define NVREG_IRQMASK_CPU		0x0040

#define NVREG_IRQMASK_CPU		0x0060

#define NVREG_IRQ_TX_ALL		(NVREG_IRQ_TX_ERR|NVREG_IRQ_TX_OK|NVREG_IRQ_TX_FORCED)

#define NVREG_IRQ_RX_ALL		(NVREG_IRQ_RX_ERROR|NVREG_IRQ_RX|NVREG_IRQ_RX_NOBUF|NVREG_IRQ_RX_FORCED)

#define NVREG_IRQ_OTHER			(NVREG_IRQ_TIMER|NVREG_IRQ_LINK|NVREG_IRQ_RECOVER_ERROR)