Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] iseries_veth: Incorporate iseries_veth.h in iseries_veth.c

Browse source 
iseries_veth.h is only used by iseries_veth.c, so merge the former into
the latter.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Michael Ellerman 2005-09-01 11:29:25 +10:00 • committed by Jeff Garzik
parent 07a5c1727d
commit 642d1a4c36
2 changed files with 40 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
drivers/net/iseries_veth.c
View file

@ -81,12 +81,50 @@
#undef DEBUG #undef DEBUG
#include "iseries_veth.h"
MODULE_AUTHOR("Kyle Lucke <klucke@us.ibm.com>"); MODULE_AUTHOR("Kyle Lucke <klucke@us.ibm.com>");
MODULE_DESCRIPTION("iSeries Virtual ethernet driver"); MODULE_DESCRIPTION("iSeries Virtual ethernet driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#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;
};
#define VETH_NUMBUFFERS (120) #define VETH_NUMBUFFERS (120)
#define VETH_ACKTIMEOUT (1000000) /* microseconds */ #define VETH_ACKTIMEOUT (1000000) /* microseconds */
#define VETH_MAX_MCAST (12) #define VETH_MAX_MCAST (12)

46
drivers/net/iseries_veth.h
View file

@ -1,46 +0,0 @@
/* 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 */