---

yaml --- r: 85849 b: refs/heads/master c: 3172936 h: refs/heads/master i: 85847: 074be7d v: v3
git-mirror · Feb 19, 2008 · 8439439 · 8439439
1 parent b8b8d60
commit 8439439
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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