diff options
Diffstat (limited to 'include/net/strparser.h')
| -rw-r--r-- | include/net/strparser.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/include/net/strparser.h b/include/net/strparser.h index 0ed73e364faa..c2938eda3e79 100644 --- a/include/net/strparser.h +++ b/include/net/strparser.h @@ -32,7 +32,6 @@ struct strp_aggr_stats { unsigned int msg_too_big; unsigned int msg_timeouts; unsigned int bad_hdr_len; - unsigned int aborts; unsigned int interrupted; unsigned int unrecov_intr; }; @@ -46,9 +45,6 @@ struct strp_callbacks { int (*read_sock)(struct strparser *strp, read_descriptor_t *desc, sk_read_actor_t recv_actor); int (*read_sock_done)(struct strparser *strp, int err); - void (*abort_parser)(struct strparser *strp, int err); - void (*lock)(struct strparser *strp); - void (*unlock)(struct strparser *strp); }; struct strp_msg { @@ -91,11 +87,10 @@ static inline struct strp_msg *strp_msg(struct sk_buff *skb) struct strparser { struct sock *sk; - u32 stopped : 1; - u32 paused : 1; - u32 aborted : 1; - u32 interrupted : 1; - u32 unrecov_intr : 1; + u8 stopped; + u8 paused; + u8 interrupted; + u8 unrecov_intr; struct sk_buff **skb_nextp; struct sk_buff *skb_head; @@ -131,8 +126,6 @@ static inline void save_strp_stats(struct strparser *strp, SAVE_PSOCK_STATS(bad_hdr_len); #undef SAVE_PSOCK_STATS - if (strp->aborted) - agg_stats->aborts++; if (strp->interrupted) agg_stats->interrupted++; if (strp->unrecov_intr) @@ -150,7 +143,6 @@ static inline void aggregate_strp_stats(struct strp_aggr_stats *stats, SAVE_PSOCK_STATS(msg_too_big); SAVE_PSOCK_STATS(msg_timeouts); SAVE_PSOCK_STATS(bad_hdr_len); - SAVE_PSOCK_STATS(aborts); SAVE_PSOCK_STATS(interrupted); SAVE_PSOCK_STATS(unrecov_intr); #undef SAVE_PSOCK_STATS @@ -163,8 +155,5 @@ void strp_check_rcv(struct strparser *strp); int strp_init(struct strparser *strp, struct sock *sk, const struct strp_callbacks *cb); void strp_data_ready(struct strparser *strp); -int strp_process(struct strparser *strp, struct sk_buff *orig_skb, - unsigned int orig_offset, size_t orig_len, - size_t max_msg_size, long timeo); #endif /* __NET_STRPARSER_H_ */ |