Commit 44757223 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

parents 712fbdd3 ee05f031

drivers/net/iseries_veth.c

+581 −288

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/iseries_veth.h

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
/* File veth.h created by Kyle A. Lucke on Mon Aug  7 2000. */



#ifndef _ISERIES_VETH_H

#define _ISERIES_VETH_H



#define VethEventTypeCap	(0)

#define VethEventTypeFrames	(1)

#define VethEventTypeMonitor	(2)

#define VethEventTypeFramesAck	(3)



#define VETH_MAX_ACKS_PER_MSG	(20)

#define VETH_MAX_FRAMES_PER_MSG	(6)



struct VethFramesData {

	u32 addr[VETH_MAX_FRAMES_PER_MSG];

	u16 len[VETH_MAX_FRAMES_PER_MSG];

	u32 eofmask;

};

#define VETH_EOF_SHIFT		(32-VETH_MAX_FRAMES_PER_MSG)



struct VethFramesAckData {

	u16 token[VETH_MAX_ACKS_PER_MSG];

};



struct VethCapData {

	u8 caps_version;

	u8 rsvd1;

	u16 num_buffers;

	u16 ack_threshold;

	u16 rsvd2;

	u32 ack_timeout;

	u32 rsvd3;

	u64 rsvd4[3];

};



struct VethLpEvent {

	struct HvLpEvent base_event;

	union {

		struct VethCapData caps_data;

		struct VethFramesData frames_data;

		struct VethFramesAckData frames_ack_data;

	} u;



};



#endif	/* _ISERIES_VETH_H */

drivers/net/tulip/de2104x.c

+1 −1
Original line number Diff line number Diff line
@@ -1934,7 +1934,7 @@ static int __init de_init_one (struct pci_dev *pdev, 
	struct de_private *de;

	int rc;

	void __iomem *regs;

	long pciaddr;

	unsigned long pciaddr;

	static int board_idx = -1;



	board_idx++;

drivers/net/tulip/tulip_core.c

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ static struct pci_device_id tulip_pci_tbl[] = { 
	{ 0x17B3, 0xAB08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },

	{ 0x10b7, 0x9300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, /* 3Com 3CSOHO100B-TX */

	{ 0x14ea, 0xab08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, /* Planex FNW-3602-TX */

	{ 0x1414, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },

	{ } /* terminate list */

};

MODULE_DEVICE_TABLE(pci, tulip_pci_tbl);