Commit 6e429101 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:
  3c509: Add missing EISA IDs
  MAINTAINERS: take maintainership of the cpmac Ethernet driver
  net/firmare: Ignore .cis files
  ath1e: add new device id for asus hardware
  mlx4_en: Fix a kernel panic when waking tx queue
  rtl8187: add USB ID for Linksys WUSB54GC-EU v2 USB wifi dongle
  at76c50x-usb: avoid mutex deadlock in at76_dwork_hw_scan
  mac8390: fix build with NET_POLL_CONTROLLER
  cxgb3: link fault fixes
  cxgb3: fix dma mapping regression
  netfilter: nfnetlink_log: fix wrong skbuff size	calculation
  netfilter: xt_hashlimit does a wrong SEQ_SKIP
  bfin_mac: fix build error due to net_device_ops convert
  atlx: move modinfo data from atlx.h to atl1.c
  gianfar: fix babbling rx error event bug
  cls_cgroup: read classid atomically in classifier
  netfilter: nf_ct_dccp: add missing DCCP protocol changes in event cache
  netfilter: nf_ct_tcp: fix accepting invalid RST segments
parents c4e51e46 cf9f6e21

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -1542,6 +1542,13 @@ W: http://www.fi.muni.cz/~kas/cosa/ 
S:	Maintained

F:	drivers/net/wan/cosa*



CPMAC ETHERNET DRIVER

P:	Florian Fainelli

M:	florian@openwrt.org

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/cpmac.c



CPU FREQUENCY DRIVERS

P:	Dave Jones

M:	davej@redhat.com

drivers/net/3c509.c

+4 −0
Original line number Diff line number Diff line
@@ -480,9 +480,13 @@ static int pnp_registered; 


#ifdef CONFIG_EISA

static struct eisa_device_id el3_eisa_ids[] = {

		{ "TCM5090" },

		{ "TCM5091" },

		{ "TCM5092" },

		{ "TCM5093" },

		{ "TCM5094" },

		{ "TCM5095" },

		{ "TCM5098" },

		{ "" }

};

MODULE_DEVICE_TABLE(eisa, el3_eisa_ids);

drivers/net/atl1e/atl1e_main.c

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ char atl1e_driver_version[] = DRV_VERSION; 
 */

static struct pci_device_id atl1e_pci_tbl[] = {

	{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1E)},

	{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, 0x1066)},

	/* required last entry */

	{ 0 }

};

drivers/net/atlx/atl1.c

+6 −0
Original line number Diff line number Diff line
@@ -82,6 +82,12 @@ 


#include "atl1.h"



#define ATLX_DRIVER_VERSION "2.1.3"

MODULE_AUTHOR("Xiong Huang <xiong.huang@atheros.com>, \

	Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.com>");

MODULE_LICENSE("GPL");

MODULE_VERSION(ATLX_DRIVER_VERSION);



/* Temporary hack for merging atl1 and atl2 */

#include "atlx.c"

drivers/net/atlx/atlx.h

+0 −6
Original line number Diff line number Diff line
@@ -29,12 +29,6 @@ 
#include <linux/module.h>

#include <linux/types.h>



#define ATLX_DRIVER_VERSION "2.1.3"

MODULE_AUTHOR("Xiong Huang <xiong.huang@atheros.com>, \

	Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.com>");

MODULE_LICENSE("GPL");

MODULE_VERSION(ATLX_DRIVER_VERSION);



#define ATLX_ERR_PHY			2

#define ATLX_ERR_PHY_SPEED		7

#define ATLX_ERR_PHY_RES		8

CRA Git | Maintained and supported by SUSTech CRA and CCSE