projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/~dwmw2/cafe-2.6
[powerpc.git]
/
drivers
/
s390
/
net
/
qeth.h
diff --git
a/drivers/s390/net/qeth.h
b/drivers/s390/net/qeth.h
index
c04ee91
..
821383d
100644
(file)
--- a/
drivers/s390/net/qeth.h
+++ b/
drivers/s390/net/qeth.h
@@
-176,7
+176,6
@@
extern struct ccwgroup_driver qeth_ccwgroup_driver;
/**
* card stuff
*/
/**
* card stuff
*/
-#ifdef CONFIG_QETH_PERF_STATS
struct qeth_perf_stats {
unsigned int bufs_rec;
unsigned int bufs_sent;
struct qeth_perf_stats {
unsigned int bufs_rec;
unsigned int bufs_sent;
@@
-211,8
+210,10
@@
struct qeth_perf_stats {
unsigned int large_send_cnt;
unsigned int sg_skbs_sent;
unsigned int sg_frags_sent;
unsigned int large_send_cnt;
unsigned int sg_skbs_sent;
unsigned int sg_frags_sent;
+ /* initial values when measuring starts */
+ unsigned long initial_rx_packets;
+ unsigned long initial_tx_packets;
};
};
-#endif /* CONFIG_QETH_PERF_STATS */
/* Routing stuff */
struct qeth_routing_info {
/* Routing stuff */
struct qeth_routing_info {
@@
-462,6
+463,7
@@
enum qeth_qdio_info_states {
QETH_QDIO_UNINITIALIZED,
QETH_QDIO_ALLOCATED,
QETH_QDIO_ESTABLISHED,
QETH_QDIO_UNINITIALIZED,
QETH_QDIO_ALLOCATED,
QETH_QDIO_ESTABLISHED,
+ QETH_QDIO_CLEANING
};
struct qeth_buffer_pool_entry {
};
struct qeth_buffer_pool_entry {
@@
-536,7
+538,7
@@
struct qeth_qdio_out_q {
} __attribute__ ((aligned(256)));
struct qeth_qdio_info {
} __attribute__ ((aligned(256)));
struct qeth_qdio_info {
-
volatile enum qeth_qdio_info_states
state;
+
atomic_t
state;
/* input */
struct qeth_qdio_q *in_q;
struct qeth_qdio_buffer_pool in_buf_pool;
/* input */
struct qeth_qdio_q *in_q;
struct qeth_qdio_buffer_pool in_buf_pool;
@@
-767,6
+769,7
@@
struct qeth_card_options {
int fake_ll;
int layer2;
enum qeth_large_send_types large_send;
int fake_ll;
int layer2;
enum qeth_large_send_types large_send;
+ int performance_stats;
};
/*
};
/*
@@
-819,9
+822,7
@@
struct qeth_card {
struct list_head cmd_waiter_list;
/* QDIO buffer handling */
struct qeth_qdio_info qdio;
struct list_head cmd_waiter_list;
/* QDIO buffer handling */
struct qeth_qdio_info qdio;
-#ifdef CONFIG_QETH_PERF_STATS
struct qeth_perf_stats perf_stats;
struct qeth_perf_stats perf_stats;
-#endif /* CONFIG_QETH_PERF_STATS */
int use_hard_stop;
int (*orig_hard_header)(struct sk_buff *,struct net_device *,
unsigned short,void *,void *,unsigned);
int use_hard_stop;
int (*orig_hard_header)(struct sk_buff *,struct net_device *,
unsigned short,void *,void *,unsigned);
@@
-1049,13
+1050,11
@@
qeth_get_arphdr_type(int cardtype, int linktype)
}
}
}
}
-#ifdef CONFIG_QETH_PERF_STATS
static inline int
qeth_get_micros(void)
{
return (int) (get_clock() >> 12);
}
static inline int
qeth_get_micros(void)
{
return (int) (get_clock() >> 12);
}
-#endif
static inline int
qeth_get_qdio_q_format(struct qeth_card *card)
static inline int
qeth_get_qdio_q_format(struct qeth_card *card)