- 4.4.172

[packages/kernel.git] / kernel-imq.patch

diff --git a/kernel-imq.patch b/kernel-imq.patch
index be2a9c43af1d74f1fea944b58f8cb975c76b2785..12cfaa4dea6c356d7216751232037506a63a59e8 100644 (file)
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1304,14 +1304,6 @@ index ae00b89..1cdcd02 100644
  
  static struct sk_buff *validate_xmit_vlan(struct sk_buff *skb,
                                          netdev_features_t features)
-@@ -2831,6 +2840,7 @@ struct sk_buff *validate_xmit_skb_list(struct sk_buff *skb, struct net_device *d
-       }
-       return head;
- }
-+EXPORT_SYMBOL(validate_xmit_skb_list);
- 
- static void qdisc_pkt_len_init(struct sk_buff *skb)
- {
 diff --git a/net/core/skbuff.c b/net/core/skbuff.c
 index b2df375..bc3c51e 100644
 --- a/net/core/skbuff.c
@@ -1591,10 +1583,10 @@ index 5baa8e2..9740e8c 100644
        int status = -ENOENT;
        struct nf_queue_entry *entry = NULL;
 @@ -124,7 +142,17 @@ int nf_queue(struct sk_buff *skb,
-       const struct nf_queue_handler *qh;
+       struct net *net = state->net;
  
        /* QUEUE == DROP if no one is waiting, to be safe. */
--      qh = rcu_dereference(queue_handler);
+-      qh = rcu_dereference(net->nf.queue_handler);
 +      if (queuetype == NF_IMQ_QUEUE) {
 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
 +              qh = rcu_dereference(queue_imq_handler);
@@ -1603,7 +1595,7 @@ index 5baa8e2..9740e8c 100644
 +              goto err_unlock;
 +#endif
 +      } else {
-+              qh = rcu_dereference(queue_handler);
++              qh = rcu_dereference(net->nf.queue_handler);
 +      }
 +
        if (!qh) {