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

Commit 642d1a4c authored by Michael Ellerman's avatar Michael Ellerman Committed by Jeff Garzik
Browse files

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



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

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 07a5c172

drivers/net/iseries_veth.c

+40 −2
Original line number Diff line number Diff line
@@ -81,12 +81,50 @@ 


#undef DEBUG



#include "iseries_veth.h"



MODULE_AUTHOR("Kyle Lucke <klucke@us.ibm.com>");

MODULE_DESCRIPTION("iSeries Virtual ethernet driver");

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_ACKTIMEOUT 	(1000000) /* microseconds */

#define VETH_MAX_MCAST		(12)

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 */