kernel: update kernel 4.4 to version 4.4.32

[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.4 / 0220-net-sched-add-skb_at_tc_ingress-helper.patch

diff --git a/target/linux/brcm2708/patches-4.4/0220-net-sched-add-skb_at_tc_ingress-helper.patch b/target/linux/brcm2708/patches-4.4/0220-net-sched-add-skb_at_tc_ingress-helper.patch
index 38f86fd9b7578c85a1ba7ea30ab2f13db69475af..8264f99210900e296fd898a157f03c495c641dc4 100644 (file)
--- a/target/linux/brcm2708/patches-4.4/0220-net-sched-add-skb_at_tc_ingress-helper.patch
+++ b/target/linux/brcm2708/patches-4.4/0220-net-sched-add-skb_at_tc_ingress-helper.patch
@@ -10,28 +10,9 @@ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
 Acked-by: Alexei Starovoitov <ast@kernel.org>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 ---
- include/net/sch_generic.h | 9 +++++++++
  net/sched/cls_bpf.c       | 6 +-----
  2 files changed, 10 insertions(+), 5 deletions(-)
 
---- a/include/net/sch_generic.h
-+++ b/include/net/sch_generic.h
-@@ -409,6 +409,15 @@ bool tcf_destroy(struct tcf_proto *tp, b
- void tcf_destroy_chain(struct tcf_proto __rcu **fl);
- int skb_do_redirect(struct sk_buff *);
- 
-+static inline bool skb_at_tc_ingress(const struct sk_buff *skb)
-+{
-+#ifdef CONFIG_NET_CLS_ACT
-+      return G_TC_AT(skb->tc_verd) & AT_INGRESS;
-+#else
-+      return false;
-+#endif
-+}
-+
- /* Reset all TX qdiscs greater then index of a device.  */
- static inline void qdisc_reset_all_tx_gt(struct net_device *dev, unsigned int i)
- {
 --- a/net/sched/cls_bpf.c
 +++ b/net/sched/cls_bpf.c
 @@ -79,12 +79,8 @@ static int cls_bpf_classify(struct sk_bu