Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
44757223
Commit
44757223
authored
Sep 02, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
parents
712fbdd3
ee05f031
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
583 additions
and
335 deletions
+583
-335
drivers/net/iseries_veth.c
drivers/net/iseries_veth.c
+581
-288
drivers/net/iseries_veth.h
drivers/net/iseries_veth.h
+0
-46
drivers/net/tulip/de2104x.c
drivers/net/tulip/de2104x.c
+1
-1
drivers/net/tulip/tulip_core.c
drivers/net/tulip/tulip_core.c
+1
-0
No files found.
drivers/net/iseries_veth.c
View file @
44757223
This diff is collapsed.
Click to expand it.
drivers/net/iseries_veth.h
deleted
100644 → 0
View file @
712fbdd3
/* 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
View file @
44757223
...
@@ -1934,7 +1934,7 @@ static int __init de_init_one (struct pci_dev *pdev,
...
@@ -1934,7 +1934,7 @@ static int __init de_init_one (struct pci_dev *pdev,
struct
de_private
*
de
;
struct
de_private
*
de
;
int
rc
;
int
rc
;
void
__iomem
*
regs
;
void
__iomem
*
regs
;
long
pciaddr
;
unsigned
long
pciaddr
;
static
int
board_idx
=
-
1
;
static
int
board_idx
=
-
1
;
board_idx
++
;
board_idx
++
;
...
...
drivers/net/tulip/tulip_core.c
View file @
44757223
...
@@ -238,6 +238,7 @@ static struct pci_device_id tulip_pci_tbl[] = {
...
@@ -238,6 +238,7 @@ static struct pci_device_id tulip_pci_tbl[] = {
{
0x17B3
,
0xAB08
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
COMET
},
{
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 */
{
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 */
{
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 */
{
}
/* terminate list */
};
};
MODULE_DEVICE_TABLE
(
pci
,
tulip_pci_tbl
);
MODULE_DEVICE_TABLE
(
pci
,
tulip_pci_tbl
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment