Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Pull networking updates from David Miller:

 1) Add BQL support to via-rhine, from Tino Reichardt.

 2) Integrate SWITCHDEV layer support into the DSA layer, so DSA drivers
    can support hw switch offloading.  From Floria Fainelli.

 3) Allow 'ip address' commands to initiate multicast group join/leave,
    from Madhu Challa.

 4) Many ipv4 FIB lookup optimizations from Alexander Duyck.

 5) Support EBPF in cls_bpf classifier and act_bpf action, from Daniel
    Borkmann.

 6) Remove the ugly compat support in ARP for ugly layers like ax25,
    rose, etc.  And use this to clean up the neigh layer, then use it to
    implement MPLS support.  All from Eric Biederman.

 7) Support L3 forwarding offloading in switches, from Scott Feldman.

 8) Collapse the LOCAL and MAIN ipv4 FIB tables when possible, to speed
    up route lookups even further.  From Alexander Duyck.

 9) Many improvements and bug fixes to the rhashtable implementation,
    from Herbert Xu and Thomas Graf.  In particular, in the case where
    an rhashtable user bulk adds a large number of items into an empty
    table, we expand the table much more sanely.

10) Don't make the tcp_metrics hash table per-namespace, from Eric
    Biederman.

11) Extend EBPF to access SKB fields, from Alexei Starovoitov.

12) Split out new connection request sockets so that they can be
    established in the main hash table.  Much less false sharing since
    hash lookups go direct to the request sockets instead of having to
    go first to the listener then to the request socks hashed
    underneath.  From Eric Dumazet.

13) Add async I/O support for crytpo AF_ALG sockets, from Tadeusz Struk.

14) Support stable privacy address generation for RFC7217 in IPV6.  From
    Hannes Frederic Sowa.

15) Hash network namespace into IP frag IDs, also from Hannes Frederic
    Sowa.

16) Convert PTP get/set methods to use 64-bit time, from Richard
    Cochran.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1816 commits)
  fm10k: Bump driver version to 0.15.2
  fm10k: corrected VF multicast update
  fm10k: mbx_update_max_size does not drop all oversized messages
  fm10k: reset head instead of calling update_max_size
  fm10k: renamed mbx_tx_dropped to mbx_tx_oversized
  fm10k: update xcast mode before synchronizing multicast addresses
  fm10k: start service timer on probe
  fm10k: fix function header comment
  fm10k: comment next_vf_mbx flow
  fm10k: don't handle mailbox events in iov_event path and always process mailbox
  fm10k: use separate workqueue for fm10k driver
  fm10k: Set PF queues to unlimited bandwidth during virtualization
  fm10k: expose tx_timeout_count as an ethtool stat
  fm10k: only increment tx_timeout_count in Tx hang path
  fm10k: remove extraneous "Reset interface" message
  fm10k: separate PF only stats so that VF does not display them
  fm10k: use hw->mac.max_queues for stats
  fm10k: only show actual queues, not the maximum in hardware
  fm10k: allow creation of VLAN on default vid
  fm10k: fix unused warnings
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/s390/kernel/irq.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
Simple merge

diff --cc drivers/net/phy/dp83640.c
Simple merge

diff --cc drivers/net/wireless/airo.c
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/mac.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h
index 6cb66a988271edc9d866939da3d2d97687d9db6c,0000000000000000000000000000000000000000..223b8752f924839bcff4028f66213032759ed124
mode 100644,000000..100644
--- 1/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h
@@@ -1,200 -1,0 +1,202 @@@
-                u32 gp1, u32 gp2, u32 gp3, u32 ucode_ver, u32 hw_ver,
 +/******************************************************************************
 + *
 + * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.
 + *
 + * This program is free software; you can redistribute it and/or modify it
 + * under the terms of version 2 of the GNU General Public License as
 + * published by the Free Software Foundation.
 + *
 + * This program is distributed in the hope that it will be useful, but WITHOUT
 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 + * more details.
 + *
 + * You should have received a copy of the GNU General Public License along with
 + * this program; if not, write to the Free Software Foundation, Inc.,
 + * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
 + *
 + * The full GNU General Public License is included in this distribution in the
 + * file called LICENSE.
 + *
 + * Contact Information:
 + *  Intel Linux Wireless <ilw@linux.intel.com>
 + * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
 + *
 + *****************************************************************************/
 +
 +#if !defined(__IWLWIFI_DEVICE_TRACE_IWLWIFI) || defined(TRACE_HEADER_MULTI_READ)
 +#define __IWLWIFI_DEVICE_TRACE_IWLWIFI
 +
 +#include <linux/tracepoint.h>
 +
 +#undef TRACE_SYSTEM
 +#define TRACE_SYSTEM iwlwifi
 +
 +TRACE_EVENT(iwlwifi_dev_hcmd,
 +      TP_PROTO(const struct device *dev,
 +               struct iwl_host_cmd *cmd, u16 total_size,
 +               struct iwl_cmd_header *hdr),
 +      TP_ARGS(dev, cmd, total_size, hdr),
 +      TP_STRUCT__entry(
 +              DEV_ENTRY
 +              __dynamic_array(u8, hcmd, total_size)
 +              __field(u32, flags)
 +      ),
 +      TP_fast_assign(
 +              int i, offset = sizeof(*hdr);
 +
 +              DEV_ASSIGN;
 +              __entry->flags = cmd->flags;
 +              memcpy(__get_dynamic_array(hcmd), hdr, sizeof(*hdr));
 +
 +              for (i = 0; i < IWL_MAX_CMD_TBS_PER_TFD; i++) {
 +                      if (!cmd->len[i])
 +                              continue;
 +                      memcpy((u8 *)__get_dynamic_array(hcmd) + offset,
 +                             cmd->data[i], cmd->len[i]);
 +                      offset += cmd->len[i];
 +              }
 +      ),
 +      TP_printk("[%s] hcmd %#.2x (%ssync)",
 +                __get_str(dev), ((u8 *)__get_dynamic_array(hcmd))[0],
 +                __entry->flags & CMD_ASYNC ? "a" : "")
 +);
 +
 +TRACE_EVENT(iwlwifi_dev_rx,
 +      TP_PROTO(const struct device *dev, const struct iwl_trans *trans,
 +               void *rxbuf, size_t len),
 +      TP_ARGS(dev, trans, rxbuf, len),
 +      TP_STRUCT__entry(
 +              DEV_ENTRY
 +              __dynamic_array(u8, rxbuf, iwl_rx_trace_len(trans, rxbuf, len))
 +      ),
 +      TP_fast_assign(
 +              DEV_ASSIGN;
 +              memcpy(__get_dynamic_array(rxbuf), rxbuf,
 +                     iwl_rx_trace_len(trans, rxbuf, len));
 +      ),
 +      TP_printk("[%s] RX cmd %#.2x",
 +                __get_str(dev), ((u8 *)__get_dynamic_array(rxbuf))[4])
 +);
 +
 +TRACE_EVENT(iwlwifi_dev_tx,
 +      TP_PROTO(const struct device *dev, struct sk_buff *skb,
 +               void *tfd, size_t tfdlen,
 +               void *buf0, size_t buf0_len,
 +               void *buf1, size_t buf1_len),
 +      TP_ARGS(dev, skb, tfd, tfdlen, buf0, buf0_len, buf1, buf1_len),
 +      TP_STRUCT__entry(
 +              DEV_ENTRY
 +
 +              __field(size_t, framelen)
 +              __dynamic_array(u8, tfd, tfdlen)
 +
 +              /*
 +               * Do not insert between or below these items,
 +               * we want to keep the frame together (except
 +               * for the possible padding).
 +               */
 +              __dynamic_array(u8, buf0, buf0_len)
 +              __dynamic_array(u8, buf1, iwl_trace_data(skb) ? 0 : buf1_len)
 +      ),
 +      TP_fast_assign(
 +              DEV_ASSIGN;
 +              __entry->framelen = buf0_len + buf1_len;
 +              memcpy(__get_dynamic_array(tfd), tfd, tfdlen);
 +              memcpy(__get_dynamic_array(buf0), buf0, buf0_len);
 +              if (!iwl_trace_data(skb))
 +                      memcpy(__get_dynamic_array(buf1), buf1, buf1_len);
 +      ),
 +      TP_printk("[%s] TX %.2x (%zu bytes)",
 +                __get_str(dev), ((u8 *)__get_dynamic_array(buf0))[0],
 +                __entry->framelen)
 +);
 +
 +TRACE_EVENT(iwlwifi_dev_ucode_error,
 +      TP_PROTO(const struct device *dev, u32 desc, u32 tsf_low,
 +               u32 data1, u32 data2, u32 line, u32 blink1,
 +               u32 blink2, u32 ilink1, u32 ilink2, u32 bcon_time,
-               gp3, ucode_ver, hw_ver, brd_ver),
++               u32 gp1, u32 gp2, u32 gp3, u32 major, u32 minor, u32 hw_ver,
 +               u32 brd_ver),
 +      TP_ARGS(dev, desc, tsf_low, data1, data2, line,
 +              blink1, blink2, ilink1, ilink2, bcon_time, gp1, gp2,
-               __field(u32, ucode_ver)
++              gp3, major, minor, hw_ver, brd_ver),
 +      TP_STRUCT__entry(
 +              DEV_ENTRY
 +              __field(u32, desc)
 +              __field(u32, tsf_low)
 +              __field(u32, data1)
 +              __field(u32, data2)
 +              __field(u32, line)
 +              __field(u32, blink1)
 +              __field(u32, blink2)
 +              __field(u32, ilink1)
 +              __field(u32, ilink2)
 +              __field(u32, bcon_time)
 +              __field(u32, gp1)
 +              __field(u32, gp2)
 +              __field(u32, gp3)
-               __entry->ucode_ver = ucode_ver;
++              __field(u32, major)
++              __field(u32, minor)
 +              __field(u32, hw_ver)
 +              __field(u32, brd_ver)
 +      ),
 +      TP_fast_assign(
 +              DEV_ASSIGN;
 +              __entry->desc = desc;
 +              __entry->tsf_low = tsf_low;
 +              __entry->data1 = data1;
 +              __entry->data2 = data2;
 +              __entry->line = line;
 +              __entry->blink1 = blink1;
 +              __entry->blink2 = blink2;
 +              __entry->ilink1 = ilink1;
 +              __entry->ilink2 = ilink2;
 +              __entry->bcon_time = bcon_time;
 +              __entry->gp1 = gp1;
 +              __entry->gp2 = gp2;
 +              __entry->gp3 = gp3;
-                 "bcon_tm %010u gp 0x%08X 0x%08X 0x%08X uCode 0x%08X "
-                 "hw 0x%08X brd 0x%08X",
++              __entry->major = major;
++              __entry->minor = minor;
 +              __entry->hw_ver = hw_ver;
 +              __entry->brd_ver = brd_ver;
 +      ),
 +      TP_printk("[%s] #%02d %010u data 0x%08X 0x%08X line %u, "
 +                "blink 0x%05X 0x%05X ilink 0x%05X 0x%05X "
-                 __entry->gp3, __entry->ucode_ver, __entry->hw_ver,
-                 __entry->brd_ver)
++                "bcon_tm %010u gp 0x%08X 0x%08X 0x%08X major 0x%08X "
++                "minor 0x%08X hw 0x%08X brd 0x%08X",
 +                __get_str(dev), __entry->desc, __entry->tsf_low,
 +                __entry->data1,
 +                __entry->data2, __entry->line, __entry->blink1,
 +                __entry->blink2, __entry->ilink1, __entry->ilink2,
 +                __entry->bcon_time, __entry->gp1, __entry->gp2,
++                __entry->gp3, __entry->major, __entry->minor,
++                __entry->hw_ver, __entry->brd_ver)
 +);
 +
 +TRACE_EVENT(iwlwifi_dev_ucode_event,
 +      TP_PROTO(const struct device *dev, u32 time, u32 data, u32 ev),
 +      TP_ARGS(dev, time, data, ev),
 +      TP_STRUCT__entry(
 +              DEV_ENTRY
 +
 +              __field(u32, time)
 +              __field(u32, data)
 +              __field(u32, ev)
 +      ),
 +      TP_fast_assign(
 +              DEV_ASSIGN;
 +              __entry->time = time;
 +              __entry->data = data;
 +              __entry->ev = ev;
 +      ),
 +      TP_printk("[%s] EVT_LOGT:%010u:0x%08x:%04u",
 +                __get_str(dev), __entry->time, __entry->data, __entry->ev)
 +);
 +#endif /* __IWLWIFI_DEVICE_TRACE_IWLWIFI */
 +
 +#undef TRACE_INCLUDE_PATH
 +#define TRACE_INCLUDE_PATH .
 +#undef TRACE_INCLUDE_FILE
 +#define TRACE_INCLUDE_FILE iwl-devtrace-iwlwifi
 +#include <trace/define_trace.h>

diff --cc drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
Simple merge

diff --cc include/linux/security.h
Simple merge

diff --cc include/uapi/linux/bpf.h
index cc47ef41076a04039e60fffad990da3443f77729,23df3e7f8e7d2eee7b196bff4c825d38ab284043..5c1cee11f777a0183f2f0fa23bb00b70ca4c97ca
--- 1/include/uapi/linux/bpf.h
--- 2/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@@ -118,9 -118,12 +118,13 @@@ enum bpf_map_type 
  enum bpf_prog_type {
        BPF_PROG_TYPE_UNSPEC,
        BPF_PROG_TYPE_SOCKET_FILTER,
 +      BPF_PROG_TYPE_KPROBE,
+       BPF_PROG_TYPE_SCHED_CLS,
+       BPF_PROG_TYPE_SCHED_ACT,
  };
  
+ #define BPF_PSEUDO_MAP_FD     1
+ 
  /* flags for BPF_MAP_UPDATE_ELEM command */
  #define BPF_ANY               0 /* create new element or update existing */
  #define BPF_NOEXIST   1 /* create new element if it didn't exist */
@@@ -164,9 -166,45 +168,48 @@@ enum bpf_func_id 
        BPF_FUNC_map_lookup_elem, /* void *map_lookup_elem(&map, &key) */
        BPF_FUNC_map_update_elem, /* int map_update_elem(&map, &key, &value, flags) */
        BPF_FUNC_map_delete_elem, /* int map_delete_elem(&map, &key) */
 +      BPF_FUNC_probe_read,      /* int bpf_probe_read(void *dst, int size, void *src) */
 +      BPF_FUNC_ktime_get_ns,    /* u64 bpf_ktime_get_ns(void) */
 +      BPF_FUNC_trace_printk,    /* int bpf_trace_printk(const char *fmt, int fmt_size, ...) */
+       BPF_FUNC_get_prandom_u32, /* u32 prandom_u32(void) */
+       BPF_FUNC_get_smp_processor_id, /* u32 raw_smp_processor_id(void) */
+ 
+       /**
+        * skb_store_bytes(skb, offset, from, len, flags) - store bytes into packet
+        * @skb: pointer to skb
+        * @offset: offset within packet from skb->data
+        * @from: pointer where to copy bytes from
+        * @len: number of bytes to store into packet
+        * @flags: bit 0 - if true, recompute skb->csum
+        *         other bits - reserved
+        * Return: 0 on success
+        */
+       BPF_FUNC_skb_store_bytes,
+ 
+       /**
+        * l3_csum_replace(skb, offset, from, to, flags) - recompute IP checksum
+        * @skb: pointer to skb
+        * @offset: offset within packet where IP checksum is located
+        * @from: old value of header field
+        * @to: new value of header field
+        * @flags: bits 0-3 - size of header field
+        *         other bits - reserved
+        * Return: 0 on success
+        */
+       BPF_FUNC_l3_csum_replace,
+ 
+       /**
+        * l4_csum_replace(skb, offset, from, to, flags) - recompute TCP/UDP checksum
+        * @skb: pointer to skb
+        * @offset: offset within packet where TCP/UDP checksum is located
+        * @from: old value of header field
+        * @to: new value of header field
+        * @flags: bits 0-3 - size of header field
+        *         bit 4 - is pseudo header
+        *         other bits - reserved
+        * Return: 0 on success
+        */
+       BPF_FUNC_l4_csum_replace,
        __BPF_FUNC_MAX_ID,
  };
  

diff --cc kernel/bpf/syscall.c
index 504c10b990efe9c21d32e33f01747e99294f69a1,ea75c654af1b0011ecf3efdd481822ce9f073a63..3bae6c59191483d48eb5934ad216cc952abaf9b1
--- 1/kernel/bpf/syscall.c
--- 2/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@@ -466,9 -467,10 +468,10 @@@ struct bpf_prog *bpf_prog_get(u32 ufd
        fdput(f);
        return prog;
  }
+ EXPORT_SYMBOL_GPL(bpf_prog_get);
  
  /* last field in 'union bpf_attr' used by this command */
 -#define       BPF_PROG_LOAD_LAST_FIELD log_buf
 +#define       BPF_PROG_LOAD_LAST_FIELD kern_version
  
  static int bpf_prog_load(union bpf_attr *attr)
  {

diff --cc kernel/events/core.c
index 06917d537302b6de0dca1254d5ef6dabb9c6228d,2fabc062716591e960dbab2c9cfc16a755895773..81aa3a4ece9f787038027bb4e5a1e456312c1182
--- 1/kernel/events/core.c
--- 2/kernel/events/core.c
+++ b/kernel/events/core.c
@@@ -6711,49 -6449,6 +6711,49 @@@ static void perf_event_free_filter(stru
        ftrace_profile_free_filter(event);
  }
  
-       if (prog->aux->prog_type != BPF_PROG_TYPE_KPROBE) {
 +static int perf_event_set_bpf_prog(struct perf_event *event, u32 prog_fd)
 +{
 +      struct bpf_prog *prog;
 +
 +      if (event->attr.type != PERF_TYPE_TRACEPOINT)
 +              return -EINVAL;
 +
 +      if (event->tp_event->prog)
 +              return -EEXIST;
 +
 +      if (!(event->tp_event->flags & TRACE_EVENT_FL_KPROBE))
 +              /* bpf programs can only be attached to kprobes */
 +              return -EINVAL;
 +
 +      prog = bpf_prog_get(prog_fd);
 +      if (IS_ERR(prog))
 +              return PTR_ERR(prog);
 +
++      if (prog->type != BPF_PROG_TYPE_KPROBE) {
 +              /* valid fd, but invalid bpf program type */
 +              bpf_prog_put(prog);
 +              return -EINVAL;
 +      }
 +
 +      event->tp_event->prog = prog;
 +
 +      return 0;
 +}
 +
 +static void perf_event_free_bpf_prog(struct perf_event *event)
 +{
 +      struct bpf_prog *prog;
 +
 +      if (!event->tp_event)
 +              return;
 +
 +      prog = event->tp_event->prog;
 +      if (prog) {
 +              event->tp_event->prog = NULL;
 +              bpf_prog_put(prog);
 +      }
 +}
 +
  #else
  
  static inline void perf_tp_register(void)

diff --cc net/mac80211/trace.h
index 755a5388dbcaaf0a4c9d855801b60e18800a2c4f,790bd45081c49f764b75330e2b3b0e6cde08d04d..4c2e7690226a870664ba456cb01dc7de0eb66caf
--- 1/net/mac80211/trace.h
--- 2/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@@ -2312,6 -2312,75 +2312,37 @@@ TRACE_EVENT(drv_tdls_recv_channel_switc
        )
  );
  
 -#ifdef CONFIG_MAC80211_MESSAGE_TRACING
 -#undef TRACE_SYSTEM
 -#define TRACE_SYSTEM mac80211_msg
 -
 -#define MAX_MSG_LEN   100
 -
 -DECLARE_EVENT_CLASS(mac80211_msg_event,
 -      TP_PROTO(struct va_format *vaf),
 -
 -      TP_ARGS(vaf),
 -
 -      TP_STRUCT__entry(
 -              __dynamic_array(char, msg, MAX_MSG_LEN)
 -      ),
 -
 -      TP_fast_assign(
 -              WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
 -                                     MAX_MSG_LEN, vaf->fmt,
 -                                     *vaf->va) >= MAX_MSG_LEN);
 -      ),
 -
 -      TP_printk("%s", __get_str(msg))
 -);
 -
 -DEFINE_EVENT(mac80211_msg_event, mac80211_info,
 -      TP_PROTO(struct va_format *vaf),
 -      TP_ARGS(vaf)
 -);
 -DEFINE_EVENT(mac80211_msg_event, mac80211_dbg,
 -      TP_PROTO(struct va_format *vaf),
 -      TP_ARGS(vaf)
 -);
 -DEFINE_EVENT(mac80211_msg_event, mac80211_err,
 -      TP_PROTO(struct va_format *vaf),
 -      TP_ARGS(vaf)
 -);
 -#endif
 -
+ TRACE_EVENT(drv_wake_tx_queue,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata,
+                struct txq_info *txq),
+ 
+       TP_ARGS(local, sdata, txq),
+ 
+       TP_STRUCT__entry(
+               LOCAL_ENTRY
+               VIF_ENTRY
+               STA_ENTRY
+               __field(u8, ac)
+               __field(u8, tid)
+       ),
+ 
+       TP_fast_assign(
+               struct ieee80211_sta *sta = txq->txq.sta;
+ 
+               LOCAL_ASSIGN;
+               VIF_ASSIGN;
+               STA_ASSIGN;
+               __entry->ac = txq->txq.ac;
+               __entry->tid = txq->txq.tid;
+       ),
+ 
+       TP_printk(
+               LOCAL_PR_FMT  VIF_PR_FMT  STA_PR_FMT " ac:%d tid:%d",
+               LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->ac, __entry->tid
+       )
+ );
+ 
  #endif /* !__MAC80211_DRIVER_TRACE || TRACE_HEADER_MULTI_READ */
  
  #undef TRACE_INCLUDE_PATH

diff --cc samples/bpf/Makefile
index fe98fb226e6e1af21dae6feb5684ebc30faffb50,d24f51bca465798cfcff96307eaf4aa101ad5833..76e3458a5419a556b1b21ffe68d5e867d435f267
--- 1/samples/bpf/Makefile
--- 2/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
@@@ -25,10 -17,7 +25,11 @@@ tracex4-objs := bpf_load.o libbpf.o tra
  always := $(hostprogs-y)
  always += sockex1_kern.o
  always += sockex2_kern.o
 +always += tracex1_kern.o
 +always += tracex2_kern.o
 +always += tracex3_kern.o
 +always += tracex4_kern.o
+ always += tcbpf1_kern.o
  
  HOSTCFLAGS += -I$(objtree)/usr/include
  

diff --cc samples/bpf/bpf_helpers.h
Simple merge

diff --cc samples/bpf/libbpf.h
Simple merge

diff --cc samples/bpf/test_verifier.c
index 740ce97cda5e6a19ab86b3370d98e6e9c7e5dc39,75d561f9fd6ae430b49248214608c00e588dd594..9ab645698ffb4374ec6d9597d9f82b8207fe4cda
--- 1/samples/bpf/test_verifier.c
--- 2/samples/bpf/test_verifier.c
+++ b/samples/bpf/test_verifier.c
@@@ -687,9 -767,9 +767,9 @@@ static int test(void
                }
                printf("#%d %s ", i, tests[i].descr);
  
-               prog_fd = bpf_prog_load(BPF_PROG_TYPE_UNSPEC, prog,
+               prog_fd = bpf_prog_load(BPF_PROG_TYPE_SOCKET_FILTER, prog,
                                        prog_len * sizeof(struct bpf_insn),
 -                                      "GPL");
 +                                      "GPL", 0);
  
                if (tests[i].result == ACCEPT) {
                        if (prog_fd < 0) {

diff --cc security/capability.c
Simple merge

diff --cc security/security.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge