From 8439439eaa57628b35e7e724552a6c463850f67d Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Mon, 18 Feb 2008 20:52:13 -0800 Subject: [PATCH] --- yaml --- r: 85849 b: refs/heads/master c: 31729363418ea25b01aa9410838c38e36792e44c h: refs/heads/master i: 85847: 074be7d132d594f2b8a3556debfe3621aa80f402 v: v3 --- [refs] | 2 +- trunk/include/linux/skbuff.h | 2 ++ trunk/include/net/sock.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6a5829ec1f8b..8b6e6cf3582f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2df96af03d97e98cbea9f9cb71fc56ea5fc544b2 +refs/heads/master: 31729363418ea25b01aa9410838c38e36792e44c diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index 412672a79e8a..bbd8d0027e2f 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -232,6 +232,8 @@ typedef unsigned char *sk_buff_data_t; * @mark: Generic packet mark * @nfct: Associated connection, if any * @ipvs_property: skbuff is owned by ipvs + * @peeked: this packet has been seen already, so stats have been + * done for it, don't do them again * @nf_trace: netfilter packet trace flag * @nfctinfo: Relationship of this skb to the connection * @nfct_reasm: netfilter conntrack re-assembly pointer diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h index 8a7889b35810..fd9876087651 100644 --- a/trunk/include/net/sock.h +++ b/trunk/include/net/sock.h @@ -180,6 +180,7 @@ struct sock_common { * @sk_sndmsg_off: cached offset for sendmsg * @sk_send_head: front of stuff to transmit * @sk_security: used by security modules + * @sk_mark: generic packet mark * @sk_write_pending: a write to stream socket waits to start * @sk_state_change: callback to indicate change in the state of the sock * @sk_data_ready: callback to indicate there is data to be processed