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

Commit d38e84ee 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:
  netns: fix double free at netns creation
  veth : add the set_mac_address capability
  sunlance: Beyond ARRAY_SIZE of ib->btx_ring
  sungem: another error printed one too early
  ISDN: fix sc/shmem printk format warning
  SMSC: timeout reaches -1
  smsc9420: handle magic field of ethtool_eeprom
  sundance: missing parentheses?
  smsc9420: fix another postfixed timeout
  wimax/i2400m: driver loads firmware v1.4 instead of v1.3
  vlan: Update skb->mac_header in __vlan_put_tag().
  cxgb3: Add support for PCI ID 0x35.
  tcp: remove obsoleted comment about different passes
  TG3: &&/|| confusion
  ATM: misplaced parentheses?
  net/mv643xx: don't disable the mib timer too early and lock properly
  net/mv643xx: use GFP_ATOMIC while atomic
  atl1c: Atheros L1C Gigabit Ethernet driver
  net: Kill skb_truesize_check(), it only catches false-positives.
  net: forcedeth: Fix wake-on-lan regression
parents 20f4d6c3 486a87f1

drivers/atm/lanai.c

+1 −1
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ static int __devinit eeprom_read(struct lanai_dev *lanai) 
		clock_l(); udelay(5);

		for (i = 128; i != 0; i >>= 1) {   /* write command out */

			tmp = (lanai->conf1 & ~CONFIG1_PROMDATA) |

			    (data & i) ? CONFIG1_PROMDATA : 0;

			    ((data & i) ? CONFIG1_PROMDATA : 0);

			if (lanai->conf1 != tmp) {

				set_config1(tmp);

				udelay(5);	/* Let new data settle */

drivers/isdn/sc/shmem.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ void memcpy_toshmem(int card, void *dest, const void *src, size_t n) 
	spin_unlock_irqrestore(&sc_adapter[card]->lock, flags);

	pr_debug("%s: set page to %#x\n",sc_adapter[card]->devicename,

		((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE)>>14)|0x80);

	pr_debug("%s: copying %d bytes from %#lx to %#lx\n",

	pr_debug("%s: copying %zu bytes from %#lx to %#lx\n",

		sc_adapter[card]->devicename, n,

		(unsigned long) src,

		sc_adapter[card]->rambase + ((unsigned long) dest %0x4000));

drivers/net/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -2342,6 +2342,17 @@ config ATL1E 
	  To compile this driver as a module, choose M here.  The module

	  will be called atl1e.



config ATL1C

	tristate "Atheros L1C Gigabit Ethernet support (EXPERIMENTAL)"

	depends on PCI && EXPERIMENTAL

	select CRC32

	select MII

	help

	  This driver supports the Atheros L1C gigabit ethernet adapter.



	  To compile this driver as a module, choose M here.  The module

	  will be called atl1c.



config JME

	tristate "JMicron(R) PCI-Express Gigabit Ethernet support"

	depends on PCI

drivers/net/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ obj-$(CONFIG_BONDING) += bonding/ 
obj-$(CONFIG_ATL1) += atlx/

obj-$(CONFIG_ATL2) += atlx/

obj-$(CONFIG_ATL1E) += atl1e/

obj-$(CONFIG_ATL1C) += atl1c/

obj-$(CONFIG_GIANFAR) += gianfar_driver.o

obj-$(CONFIG_TEHUTI) += tehuti.o

obj-$(CONFIG_ENIC) += enic/

drivers/net/atl1c/Makefile

0 → 100644
+2 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_ATL1C) += atl1c.o

atl1c-objs := atl1c_main.o atl1c_hw.o atl1c_ethtool.o