From 605c1229b82fc427f038b9c6c987ec354f430838 Mon Sep 17 00:00:00 2001
From: Daniel Borkmann <dborkman@redhat.com>
Date: Sat, 15 Dec 2012 10:12:43 +0000
Subject: [PATCH] --- yaml --- r: 347303 b: refs/heads/master c:
 4cb9d6eaf85ecdd266a9a5c6d825c56ca9eefc14 h: refs/heads/master i:   347301:
 8330ea16bb8a1a0d10de5a14bb57e46d75a7eb3a   347299:
 7d52cd3d2122a3da73aa41f652d042e68995afa7   347295:
 84ebe6715e663404ac17d4c76cee738f272f3488 v: v3

---
 [refs]                 | 2 +-
 trunk/net/sctp/probe.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a98c6d2ac69c..9c97cf110936 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccb1c31a7a8744cd153a7d92b726a56b56ad61d3
+refs/heads/master: 4cb9d6eaf85ecdd266a9a5c6d825c56ca9eefc14
diff --git a/trunk/net/sctp/probe.c b/trunk/net/sctp/probe.c
index bc6cd75cc1dc..5f7518de2fd1 100644
--- a/trunk/net/sctp/probe.c
+++ b/trunk/net/sctp/probe.c
@@ -122,7 +122,8 @@ static const struct file_operations sctpprobe_fops = {
 	.llseek = noop_llseek,
 };
 
-sctp_disposition_t jsctp_sf_eat_sack(const struct sctp_endpoint *ep,
+sctp_disposition_t jsctp_sf_eat_sack(struct net *net,
+				     const struct sctp_endpoint *ep,
 				     const struct sctp_association *asoc,
 				     const sctp_subtype_t type,
 				     void *arg,