Update kernel headers

Update kernel headers to commit:
    88be32634905 ("Merge branch 'dsa-tagger-helpers'")

Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index 907745f47dec8745eadd3416885ea2dd2b5812fe..cf665bdf0a04ab2860e5876f71f644a5868e160d 100644 (file)
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -549,6 +549,20 @@ enum {
        BRIDGE_VLANDB_GOPTS_ID,
        BRIDGE_VLANDB_GOPTS_RANGE,
        BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING,
+       BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION,
+       BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION,
+       BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT,
+       BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT,
+       BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL,
+       BRIDGE_VLANDB_GOPTS_PAD,
+       BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL,
+       BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL,
+       BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL,
+       BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL,
+       BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL,
+       BRIDGE_VLANDB_GOPTS_MCAST_QUERIER,
+       BRIDGE_VLANDB_GOPTS_MCAST_ROUTER,
+       BRIDGE_VLANDB_GOPTS_MCAST_ROUTER_PORTS,
        __BRIDGE_VLANDB_GOPTS_MAX
 };
 #define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 62512efc4f73eae618ef7922092f8b3ca9849ea2..fb2ecf403a16cf5771d6c19790186b618e3c6dea 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -853,6 +853,7 @@ enum {
        IFLA_BOND_AD_ACTOR_SYSTEM,
        IFLA_BOND_TLB_DYNAMIC_LB,
        IFLA_BOND_PEER_NOTIF_DELAY,
+       IFLA_BOND_AD_LACP_ACTIVE,
        __IFLA_BOND_MAX,
 };
 

diff --git a/include/uapi/linux/in.h b/include/uapi/linux/in.h
index 8e2de9fccccbb3298e6d12ac5c5c35506408cfe5..42cfea14401dfa6dedc22ecf215349a76686b0f0 100644 (file)
--- a/include/uapi/linux/in.h
+++ b/include/uapi/linux/in.h
@@ -222,11 +222,22 @@ struct group_source_req {
 };
 
 struct group_filter {
-       __u32                            gf_interface;  /* interface index */
-       struct __kernel_sockaddr_storage gf_group;      /* multicast address */
-       __u32                            gf_fmode;      /* filter mode */
-       __u32                            gf_numsrc;     /* number of sources */
-       struct __kernel_sockaddr_storage gf_slist[1];   /* interface index */
+       union {
+               struct {
+                       __u32                            gf_interface_aux; /* interface index */
+                       struct __kernel_sockaddr_storage gf_group_aux;     /* multicast address */
+                       __u32                            gf_fmode_aux;     /* filter mode */
+                       __u32                            gf_numsrc_aux;    /* number of sources */
+                       struct __kernel_sockaddr_storage gf_slist[1];      /* interface index */
+               };
+               struct {
+                       __u32                            gf_interface;    /* interface index */
+                       struct __kernel_sockaddr_storage gf_group;        /* multicast address */
+                       __u32                            gf_fmode;        /* filter mode */
+                       __u32                            gf_numsrc;       /* number of sources */
+                       struct __kernel_sockaddr_storage gf_slist_flex[]; /* interface index */
+               };
+       };
 };
 
 #define GROUP_FILTER_SIZE(numsrc) \

diff --git a/include/uapi/linux/socket.h b/include/uapi/linux/socket.h
index debcf26f6c2ac1f7519f7ab2165e65f87e9995da..ca7c25a269e72f228cfd3e7a07729071cbd746db 100644 (file)
--- a/include/uapi/linux/socket.h
+++ b/include/uapi/linux/socket.h
@@ -26,4 +26,9 @@ struct __kernel_sockaddr_storage {
        };
 };
 
+#define SOCK_SNDBUF_LOCK       1
+#define SOCK_RCVBUF_LOCK       2
+
+#define SOCK_BUF_LOCK_MASK (SOCK_SNDBUF_LOCK | SOCK_RCVBUF_LOCK)
+
 #endif /* _LINUX_SOCKET_H */