Patched in Tegra support.

1 files changed, 25 insertions, 27 deletions

diff --git a/include/net/netfilter/nf_conntrack_ecache.h b/include/net/netfilter/nf_conntrack_ecache.h
index 5654d292efd..4283508b3e1 100644
--- a/include/net/netfilter/nf_conntrack_ecache.h
+++ b/include/net/netfilter/nf_conntrack_ecache.h
@@ -17,8 +17,7 @@ struct nf_conntrack_ecache {
         unsigned long missed;   /* missed events */
         u16 ctmask;             /* bitmask of ct events to be delivered */
         u16 expmask;            /* bitmask of expect events to be delivered */
-        u32 portid;             /* netlink portid of destroyer */
-        struct timer_list timeout;
+        u32 pid;                /* netlink pid of destroyer */
 };
 
 static inline struct nf_conntrack_ecache *
@@ -60,7 +59,7 @@ nf_ct_ecache_ext_add(struct nf_conn *ct, u16 ctmask, u16 expmask, gfp_t gfp)
 /* This structure is passed to event handler */
 struct nf_ct_event {
         struct nf_conn *ct;
-        u32 portid;
+        u32 pid;
         int report;
 };
 
@@ -68,18 +67,18 @@ struct nf_ct_event_notifier {
         int (*fcn)(unsigned int events, struct nf_ct_event *item);
 };
 
-extern int nf_conntrack_register_notifier(struct net *net, struct nf_ct_event_notifier *nb);
-extern void nf_conntrack_unregister_notifier(struct net *net, struct nf_ct_event_notifier *nb);
+extern struct nf_ct_event_notifier __rcu *nf_conntrack_event_cb;
+extern int nf_conntrack_register_notifier(struct nf_ct_event_notifier *nb);
+extern void nf_conntrack_unregister_notifier(struct nf_ct_event_notifier *nb);
 
 extern void nf_ct_deliver_cached_events(struct nf_conn *ct);
 
 static inline void
 nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct)
 {
-        struct net *net = nf_ct_net(ct);
         struct nf_conntrack_ecache *e;
 
-        if (!rcu_access_pointer(net->ct.nf_conntrack_event_cb))
+        if (nf_conntrack_event_cb == NULL)
                 return;
 
         e = nf_ct_ecache_find(ct);
@@ -92,16 +91,15 @@ nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct)
 static inline int
 nf_conntrack_eventmask_report(unsigned int eventmask,
                               struct nf_conn *ct,
-                              u32 portid,
+                              u32 pid,
                               int report)
 {
         int ret = 0;
-        struct net *net = nf_ct_net(ct);
         struct nf_ct_event_notifier *notify;
         struct nf_conntrack_ecache *e;
 
         rcu_read_lock();
-        notify = rcu_dereference(net->ct.nf_conntrack_event_cb);
+        notify = rcu_dereference(nf_conntrack_event_cb);
         if (notify == NULL)
                 goto out_unlock;
 
@@ -112,11 +110,11 @@ nf_conntrack_eventmask_report(unsigned int eventmask,
         if (nf_ct_is_confirmed(ct) && !nf_ct_is_dying(ct)) {
                 struct nf_ct_event item = {
                         .ct     = ct,
-                        .portid = e->portid ? e->portid : portid,
+                        .pid    = e->pid ? e->pid : pid,
                         .report = report
                 };
                 /* This is a resent of a destroy event? If so, skip missed */
-                unsigned long missed = e->portid ? 0 : e->missed;
+                unsigned long missed = e->pid ? 0 : e->missed;
 
                 if (!((eventmask | missed) & e->ctmask))
                         goto out_unlock;
@@ -126,11 +124,11 @@ nf_conntrack_eventmask_report(unsigned int eventmask,
                         spin_lock_bh(&ct->lock);
                         if (ret < 0) {
                                 /* This is a destroy event that has been
-                                 * triggered by a process, we store the PORTID
+                                 * triggered by a process, we store the PID
                                  * to include it in the retransmission. */
                                 if (eventmask & (1 << IPCT_DESTROY) &&
-                                    e->portid == 0 && portid != 0)
-                                        e->portid = portid;
+                                    e->pid == 0 && pid != 0)
+                                        e->pid = pid;
                                 else
                                         e->missed |= eventmask;
                         } else
@@ -145,9 +143,9 @@ out_unlock:
 
 static inline int
 nf_conntrack_event_report(enum ip_conntrack_events event, struct nf_conn *ct,
-                          u32 portid, int report)
+                          u32 pid, int report)
 {
-        return nf_conntrack_eventmask_report(1 << event, ct, portid, report);
+        return nf_conntrack_eventmask_report(1 << event, ct, pid, report);
 }
 
 static inline int
@@ -158,7 +156,7 @@ nf_conntrack_event(enum ip_conntrack_events event, struct nf_conn *ct)
 
 struct nf_exp_event {
         struct nf_conntrack_expect *exp;
-        u32 portid;
+        u32 pid;
         int report;
 };
 
@@ -166,21 +164,21 @@ struct nf_exp_event_notifier {
         int (*fcn)(unsigned int events, struct nf_exp_event *item);
 };
 
-extern int nf_ct_expect_register_notifier(struct net *net, struct nf_exp_event_notifier *nb);
-extern void nf_ct_expect_unregister_notifier(struct net *net, struct nf_exp_event_notifier *nb);
+extern struct nf_exp_event_notifier __rcu *nf_expect_event_cb;
+extern int nf_ct_expect_register_notifier(struct nf_exp_event_notifier *nb);
+extern void nf_ct_expect_unregister_notifier(struct nf_exp_event_notifier *nb);
 
 static inline void
 nf_ct_expect_event_report(enum ip_conntrack_expect_events event,
                           struct nf_conntrack_expect *exp,
-                          u32 portid,
+                          u32 pid,
                           int report)
 {
-        struct net *net = nf_ct_exp_net(exp);
         struct nf_exp_event_notifier *notify;
         struct nf_conntrack_ecache *e;
 
         rcu_read_lock();
-        notify = rcu_dereference(net->ct.nf_expect_event_cb);
+        notify = rcu_dereference(nf_expect_event_cb);
         if (notify == NULL)
                 goto out_unlock;
 
@@ -191,7 +189,7 @@ nf_ct_expect_event_report(enum ip_conntrack_expect_events event,
         if (e->expmask & (1 << event)) {
                 struct nf_exp_event item = {
                         .exp    = exp,
-                        .portid = portid,
+                        .pid    = pid,
                         .report = report
                 };
                 notify->fcn(1 << event, &item);
@@ -216,20 +214,20 @@ static inline void nf_conntrack_event_cache(enum ip_conntrack_events event,
                                             struct nf_conn *ct) {}
 static inline int nf_conntrack_eventmask_report(unsigned int eventmask,
                                                 struct nf_conn *ct,
-                                                u32 portid,
+                                                u32 pid,
                                                 int report) { return 0; }
 static inline int nf_conntrack_event(enum ip_conntrack_events event,
                                      struct nf_conn *ct) { return 0; }
 static inline int nf_conntrack_event_report(enum ip_conntrack_events event,
                                             struct nf_conn *ct,
-                                            u32 portid,
+                                            u32 pid,
                                             int report) { return 0; }
 static inline void nf_ct_deliver_cached_events(const struct nf_conn *ct) {}
 static inline void nf_ct_expect_event(enum ip_conntrack_expect_events event,
                                       struct nf_conntrack_expect *exp) {}
 static inline void nf_ct_expect_event_report(enum ip_conntrack_expect_events e,
                                              struct nf_conntrack_expect *exp,
-                                             u32 portid,
+                                             u32 pid,
                                              int report) {}
 
 static inline int nf_conntrack_ecache_init(struct net *net)