Skip to content

L
linux-davinci-2.6.23
Commit 59f17aeb authored by Michael Ellerman's avatar Michael Ellerman Committed by Jeff Garzik
Browse files
Options

[PATCH] iseries_veth: Remove studly caps from iseries_veth.c 

Having merged iseries_veth.h, let's remove some of the studly caps that came
with it.
Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 642d1a4c
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 37 deletions
drivers/net/iseries_veth.c
View file @ 59f17aeb
...@@ -85,26 +85,26 @@ MODULE_AUTHOR("Kyle Lucke <klucke@us.ibm.com>"); ...@@ -85,26 +85,26 @@ 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 VETH_EVENT_CAP (0)
#define VethEventTypeFrames (1) #define VETH_EVENT_FRAMES (1)
#define VethEventTypeMonitor (2) #define VETH_EVENT_MONITOR (2)
#define VethEventTypeFramesAck (3) #define VETH_EVENT_FRAMES_ACK (3)
#define VETH_MAX_ACKS_PER_MSG (20) #define VETH_MAX_ACKS_PER_MSG (20)
#define VETH_MAX_FRAMES_PER_MSG (6) #define VETH_MAX_FRAMES_PER_MSG (6)
struct VethFramesData { struct veth_frames_data {
u32 addr[VETH_MAX_FRAMES_PER_MSG]; u32 addr[VETH_MAX_FRAMES_PER_MSG];
u16 len[VETH_MAX_FRAMES_PER_MSG]; u16 len[VETH_MAX_FRAMES_PER_MSG];
u32 eofmask; u32 eofmask;
}; };
#define VETH_EOF_SHIFT (32-VETH_MAX_FRAMES_PER_MSG) #define VETH_EOF_SHIFT (32-VETH_MAX_FRAMES_PER_MSG)
struct VethFramesAckData { struct veth_frames_ack_data {
u16 token[VETH_MAX_ACKS_PER_MSG]; u16 token[VETH_MAX_ACKS_PER_MSG];
}; };
struct VethCapData { struct veth_cap_data {
u8 caps_version; u8 caps_version;
u8 rsvd1; u8 rsvd1;
u16 num_buffers; u16 num_buffers;
...@@ -115,12 +115,12 @@ struct VethCapData { ...@@ -115,12 +115,12 @@ struct VethCapData {
u64 rsvd4[3]; u64 rsvd4[3];
}; };
struct VethLpEvent { struct veth_lpevent {
struct HvLpEvent base_event; struct HvLpEvent base_event;
union { union {
struct VethCapData caps_data; struct veth_cap_data caps_data;
struct VethFramesData frames_data; struct veth_frames_data frames_data;
struct VethFramesAckData frames_ack_data; struct veth_frames_ack_data frames_ack_data;
} u; } u;
}; };
...@@ -153,7 +153,7 @@ struct VethLpEvent { ...@@ -153,7 +153,7 @@ struct VethLpEvent {
struct veth_msg { struct veth_msg {
struct veth_msg *next; struct veth_msg *next;
struct VethFramesData data; struct veth_frames_data data;
int token; int token;
int in_use; int in_use;
struct sk_buff *skb; struct sk_buff *skb;
...@@ -165,7 +165,7 @@ struct veth_lpar_connection { ...@@ -165,7 +165,7 @@ struct veth_lpar_connection {
struct work_struct statemachine_wq; struct work_struct statemachine_wq;
struct veth_msg *msgs; struct veth_msg *msgs;
int num_events; int num_events;
struct VethCapData local_caps; struct veth_cap_data local_caps;
struct kobject kobject; struct kobject kobject;
struct timer_list ack_timer; struct timer_list ack_timer;
...@@ -179,12 +179,12 @@ struct veth_lpar_connection { ...@@ -179,12 +179,12 @@ struct veth_lpar_connection {
unsigned long state; unsigned long state;
HvLpInstanceId src_inst; HvLpInstanceId src_inst;
HvLpInstanceId dst_inst; HvLpInstanceId dst_inst;
struct VethLpEvent cap_event, cap_ack_event; struct veth_lpevent cap_event, cap_ack_event;
u16 pending_acks[VETH_MAX_ACKS_PER_MSG]; u16 pending_acks[VETH_MAX_ACKS_PER_MSG];
u32 num_pending_acks; u32 num_pending_acks;
int num_ack_events; int num_ack_events;
struct VethCapData remote_caps; struct veth_cap_data remote_caps;
u32 ack_timeout; u32 ack_timeout;
struct veth_msg *msg_stack_head; struct veth_msg *msg_stack_head;
...@@ -217,7 +217,7 @@ static int veth_start_xmit(struct sk_buff *skb, struct net_device *dev); ...@@ -217,7 +217,7 @@ static int veth_start_xmit(struct sk_buff *skb, struct net_device *dev);
static void veth_recycle_msg(struct veth_lpar_connection *, struct veth_msg *); static void veth_recycle_msg(struct veth_lpar_connection *, struct veth_msg *);
static void veth_wake_queues(struct veth_lpar_connection *cnx); static void veth_wake_queues(struct veth_lpar_connection *cnx);
static void veth_stop_queues(struct veth_lpar_connection *cnx); static void veth_stop_queues(struct veth_lpar_connection *cnx);
static void veth_receive(struct veth_lpar_connection *, struct VethLpEvent *); static void veth_receive(struct veth_lpar_connection *, struct veth_lpevent *);
static void veth_release_connection(struct kobject *kobject); static void veth_release_connection(struct kobject *kobject);
static void veth_timed_ack(unsigned long ptr); static void veth_timed_ack(unsigned long ptr);
static void veth_timed_reset(unsigned long ptr); static void veth_timed_reset(unsigned long ptr);
...@@ -308,7 +308,7 @@ static int veth_allocate_events(HvLpIndex rlp, int number) ...@@ -308,7 +308,7 @@ static int veth_allocate_events(HvLpIndex rlp, int number)
struct veth_allocation vc = { COMPLETION_INITIALIZER(vc.c), 0 }; struct veth_allocation vc = { COMPLETION_INITIALIZER(vc.c), 0 };
mf_allocate_lp_events(rlp, HvLpEvent_Type_VirtualLan, mf_allocate_lp_events(rlp, HvLpEvent_Type_VirtualLan,
sizeof(struct VethLpEvent), number, sizeof(struct veth_lpevent), number,
&veth_complete_allocation, &vc); &veth_complete_allocation, &vc);
wait_for_completion(&vc.c); wait_for_completion(&vc.c);
...@@ -456,7 +456,7 @@ static inline void veth_kick_statemachine(struct veth_lpar_connection *cnx) ...@@ -456,7 +456,7 @@ static inline void veth_kick_statemachine(struct veth_lpar_connection *cnx)
} }
static void veth_take_cap(struct veth_lpar_connection *cnx, static void veth_take_cap(struct veth_lpar_connection *cnx,
struct VethLpEvent *event) struct veth_lpevent *event)
{ {
unsigned long flags; unsigned long flags;
...@@ -481,7 +481,7 @@ static void veth_take_cap(struct veth_lpar_connection *cnx, ...@@ -481,7 +481,7 @@ static void veth_take_cap(struct veth_lpar_connection *cnx,
} }
static void veth_take_cap_ack(struct veth_lpar_connection *cnx, static void veth_take_cap_ack(struct veth_lpar_connection *cnx,
struct VethLpEvent *event) struct veth_lpevent *event)
{ {
unsigned long flags; unsigned long flags;
...@@ -499,7 +499,7 @@ static void veth_take_cap_ack(struct veth_lpar_connection *cnx, ...@@ -499,7 +499,7 @@ static void veth_take_cap_ack(struct veth_lpar_connection *cnx,
} }
static void veth_take_monitor_ack(struct veth_lpar_connection *cnx, static void veth_take_monitor_ack(struct veth_lpar_connection *cnx,
struct VethLpEvent *event) struct veth_lpevent *event)
{ {
unsigned long flags; unsigned long flags;
...@@ -516,7 +516,7 @@ static void veth_take_monitor_ack(struct veth_lpar_connection *cnx, ...@@ -516,7 +516,7 @@ static void veth_take_monitor_ack(struct veth_lpar_connection *cnx,
spin_unlock_irqrestore(&cnx->lock, flags); spin_unlock_irqrestore(&cnx->lock, flags);
} }
static void veth_handle_ack(struct VethLpEvent *event) static void veth_handle_ack(struct veth_lpevent *event)
{ {
HvLpIndex rlp = event->base_event.xTargetLp; HvLpIndex rlp = event->base_event.xTargetLp;
struct veth_lpar_connection *cnx = veth_cnx[rlp]; struct veth_lpar_connection *cnx = veth_cnx[rlp];
...@@ -524,10 +524,10 @@ static void veth_handle_ack(struct VethLpEvent *event) ...@@ -524,10 +524,10 @@ static void veth_handle_ack(struct VethLpEvent *event)
BUG_ON(! cnx); BUG_ON(! cnx);
switch (event->base_event.xSubtype) { switch (event->base_event.xSubtype) {
case VethEventTypeCap: case VETH_EVENT_CAP:
veth_take_cap_ack(cnx, event); veth_take_cap_ack(cnx, event);
break; break;
case VethEventTypeMonitor: case VETH_EVENT_MONITOR:
veth_take_monitor_ack(cnx, event); veth_take_monitor_ack(cnx, event);
break; break;
default: default:
...@@ -536,7 +536,7 @@ static void veth_handle_ack(struct VethLpEvent *event) ...@@ -536,7 +536,7 @@ static void veth_handle_ack(struct VethLpEvent *event)
}; };
} }
static void veth_handle_int(struct VethLpEvent *event) static void veth_handle_int(struct veth_lpevent *event)
{ {
HvLpIndex rlp = event->base_event.xSourceLp; HvLpIndex rlp = event->base_event.xSourceLp;
struct veth_lpar_connection *cnx = veth_cnx[rlp]; struct veth_lpar_connection *cnx = veth_cnx[rlp];
...@@ -546,14 +546,14 @@ static void veth_handle_int(struct VethLpEvent *event) ...@@ -546,14 +546,14 @@ static void veth_handle_int(struct VethLpEvent *event)
BUG_ON(! cnx); BUG_ON(! cnx);
switch (event->base_event.xSubtype) { switch (event->base_event.xSubtype) {
case VethEventTypeCap: case VETH_EVENT_CAP:
veth_take_cap(cnx, event); veth_take_cap(cnx, event);
break; break;
case VethEventTypeMonitor: case VETH_EVENT_MONITOR:
/* do nothing... this'll hang out here til we're dead, /* do nothing... this'll hang out here til we're dead,
* and the hypervisor will return it for us. */ * and the hypervisor will return it for us. */
break; break;
case VethEventTypeFramesAck: case VETH_EVENT_FRAMES_ACK:
spin_lock_irqsave(&cnx->lock, flags); spin_lock_irqsave(&cnx->lock, flags);
for (i = 0; i < VETH_MAX_ACKS_PER_MSG; ++i) { for (i = 0; i < VETH_MAX_ACKS_PER_MSG; ++i) {
...@@ -573,7 +573,7 @@ static void veth_handle_int(struct VethLpEvent *event) ...@@ -573,7 +573,7 @@ static void veth_handle_int(struct VethLpEvent *event)
spin_unlock_irqrestore(&cnx->lock, flags); spin_unlock_irqrestore(&cnx->lock, flags);
break; break;
case VethEventTypeFrames: case VETH_EVENT_FRAMES:
veth_receive(cnx, event); veth_receive(cnx, event);
break; break;
default: default:
...@@ -584,7 +584,7 @@ static void veth_handle_int(struct VethLpEvent *event) ...@@ -584,7 +584,7 @@ static void veth_handle_int(struct VethLpEvent *event)
static void veth_handle_event(struct HvLpEvent *event, struct pt_regs *regs) static void veth_handle_event(struct HvLpEvent *event, struct pt_regs *regs)
{ {
struct VethLpEvent *veth_event = (struct VethLpEvent *)event; struct veth_lpevent *veth_event = (struct veth_lpevent *)event;
if (event->xFlags.xFunction == HvLpEvent_Function_Ack) if (event->xFlags.xFunction == HvLpEvent_Function_Ack)
veth_handle_ack(veth_event); veth_handle_ack(veth_event);
...@@ -594,7 +594,7 @@ static void veth_handle_event(struct HvLpEvent *event, struct pt_regs *regs) ...@@ -594,7 +594,7 @@ static void veth_handle_event(struct HvLpEvent *event, struct pt_regs *regs)
static int veth_process_caps(struct veth_lpar_connection *cnx) static int veth_process_caps(struct veth_lpar_connection *cnx)
{ {
struct VethCapData *remote_caps = &cnx->remote_caps; struct veth_cap_data *remote_caps = &cnx->remote_caps;
int num_acks_needed; int num_acks_needed;
/* Convert timer to jiffies */ /* Convert timer to jiffies */
...@@ -710,7 +710,7 @@ static void veth_statemachine(void *p) ...@@ -710,7 +710,7 @@ static void veth_statemachine(void *p)
if ( (cnx->state & VETH_STATE_OPEN) if ( (cnx->state & VETH_STATE_OPEN)
&& !(cnx->state & VETH_STATE_SENTMON) ) { && !(cnx->state & VETH_STATE_SENTMON) ) {
rc = veth_signalevent(cnx, VethEventTypeMonitor, rc = veth_signalevent(cnx, VETH_EVENT_MONITOR,
HvLpEvent_AckInd_DoAck, HvLpEvent_AckInd_DoAck,
HvLpEvent_AckType_DeferredAck, HvLpEvent_AckType_DeferredAck,
0, 0, 0, 0, 0, 0); 0, 0, 0, 0, 0, 0);
...@@ -733,7 +733,7 @@ static void veth_statemachine(void *p) ...@@ -733,7 +733,7 @@ static void veth_statemachine(void *p)
&& !(cnx->state & VETH_STATE_SENTCAPS)) { && !(cnx->state & VETH_STATE_SENTCAPS)) {
u64 *rawcap = (u64 *)&cnx->local_caps; u64 *rawcap = (u64 *)&cnx->local_caps;
rc = veth_signalevent(cnx, VethEventTypeCap, rc = veth_signalevent(cnx, VETH_EVENT_CAP,
HvLpEvent_AckInd_DoAck, HvLpEvent_AckInd_DoAck,
HvLpEvent_AckType_ImmediateAck, HvLpEvent_AckType_ImmediateAck,
0, rawcap[0], rawcap[1], rawcap[2], 0, rawcap[0], rawcap[1], rawcap[2],
...@@ -755,7 +755,7 @@ static void veth_statemachine(void *p) ...@@ -755,7 +755,7 @@ static void veth_statemachine(void *p)
if ((cnx->state & VETH_STATE_GOTCAPS) if ((cnx->state & VETH_STATE_GOTCAPS)
&& !(cnx->state & VETH_STATE_SENTCAPACK)) { && !(cnx->state & VETH_STATE_SENTCAPACK)) {
struct VethCapData *remote_caps = &cnx->remote_caps; struct veth_cap_data *remote_caps = &cnx->remote_caps;
memcpy(remote_caps, &cnx->cap_event.u.caps_data, memcpy(remote_caps, &cnx->cap_event.u.caps_data,
sizeof(*remote_caps)); sizeof(*remote_caps));
...@@ -1142,7 +1142,7 @@ static int veth_transmit_to_one(struct sk_buff *skb, HvLpIndex rlp, ...@@ -1142,7 +1142,7 @@ static int veth_transmit_to_one(struct sk_buff *skb, HvLpIndex rlp,
msg->data.len[0] = skb->len; msg->data.len[0] = skb->len;
msg->data.eofmask = 1 << VETH_EOF_SHIFT; msg->data.eofmask = 1 << VETH_EOF_SHIFT;
rc = veth_signaldata(cnx, VethEventTypeFrames, msg->token, &msg->data); rc = veth_signaldata(cnx, VETH_EVENT_FRAMES, msg->token, &msg->data);
if (rc != HvLpEvent_Rc_Good) if (rc != HvLpEvent_Rc_Good)
goto recycle_and_drop; goto recycle_and_drop;
...@@ -1409,7 +1409,7 @@ static void veth_flush_acks(struct veth_lpar_connection *cnx) ...@@ -1409,7 +1409,7 @@ static void veth_flush_acks(struct veth_lpar_connection *cnx)
{ {
HvLpEvent_Rc rc; HvLpEvent_Rc rc;
rc = veth_signaldata(cnx, VethEventTypeFramesAck, rc = veth_signaldata(cnx, VETH_EVENT_FRAMES_ACK,
0, &cnx->pending_acks); 0, &cnx->pending_acks);
if (rc != HvLpEvent_Rc_Good) if (rc != HvLpEvent_Rc_Good)
...@@ -1421,9 +1421,9 @@ static void veth_flush_acks(struct veth_lpar_connection *cnx) ...@@ -1421,9 +1421,9 @@ static void veth_flush_acks(struct veth_lpar_connection *cnx)
} }
static void veth_receive(struct veth_lpar_connection *cnx, static void veth_receive(struct veth_lpar_connection *cnx,
struct VethLpEvent *event) struct veth_lpevent *event)
{ {
struct VethFramesData *senddata = &event->u.frames_data; struct veth_frames_data *senddata = &event->u.frames_data;
int startchunk = 0; int startchunk = 0;
int nchunks; int nchunks;
unsigned long flags; unsigned long flags;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment