Update kernel headers

Update kernel headers to commit:
    a99ef548bba0 ("bnx2x: Set ivi->vlan field as an integer")

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

diff --git a/include/uapi/linux/nexthop.h b/include/uapi/linux/nexthop.h
index 7e340bec94f2753a853eaefd9fe3238d0404e58c..afbd064f8fd6dc8e948b22201d38595cf4c5eeb8 100644 (file)
--- a/include/uapi/linux/nexthop.h
+++ b/include/uapi/linux/nexthop.h
@@ -16,10 +16,15 @@ struct nhmsg {
 struct nexthop_grp {
        __u32   id;       /* nexthop id - must exist */
        __u8    weight;   /* weight of this nexthop */
-       __u8    resvd1;
+       __u8    weight_high;    /* high order bits of weight */
        __u16   resvd2;
 };
 
+static __inline__ __u16 nexthop_grp_weight(const struct nexthop_grp *entry)
+{
+       return ((entry->weight_high << 8) | entry->weight) + 1;
+}
+
 enum {
        NEXTHOP_GRP_TYPE_MPATH,  /* hash-threshold nexthop group
                                  * default type if not specified
@@ -33,6 +38,9 @@ enum {
 #define NHA_OP_FLAG_DUMP_STATS         BIT(0)
 #define NHA_OP_FLAG_DUMP_HW_STATS      BIT(1)
 
+/* Response OP_FLAGS. */
+#define NHA_OP_FLAG_RESP_GRP_RESVD_0   BIT(31) /* Dump clears resvd fields. */
+
 enum {
        NHA_UNSPEC,
        NHA_ID,         /* u32; id for nexthop. id == 0 means auto-assign */

diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index d36d9cdf0c00830d2d249d7411350b594a05bf45..2c32080416b5a3cc0472a7d368fe34e386fa8cc0 100644 (file)
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -246,16 +246,19 @@ struct tc_u32_key {
 };
 
 struct tc_u32_sel {
-       unsigned char           flags;
-       unsigned char           offshift;
-       unsigned char           nkeys;
-
-       __be16                  offmask;
-       __u16                   off;
-       short                   offoff;
-
-       short                   hoff;
-       __be32                  hmask;
+       /* New members MUST be added within the __struct_group() macro below. */
+       __struct_group(tc_u32_sel_hdr, hdr, /* no attrs */,
+               unsigned char           flags;
+               unsigned char           offshift;
+               unsigned char           nkeys;
+
+               __be16                  offmask;
+               __u16                   off;
+               short                   offoff;
+
+               short                   hoff;
+               __be32                  hmask;
+       );
        struct tc_u32_key       keys[];
 };