udp: introduce udp->udp_flags

[platform/kernel/linux-starfive.git] / include / linux / udp.h

diff --git a/include/linux/udp.h b/include/linux/udp.h
index 43c1fb2..23f0693 100644 (file)
--- a/include/linux/udp.h
+++ b/include/linux/udp.h
@@ -32,14 +32,20 @@ static inline u32 udp_hashfn(const struct net *net, u32 num, u32 mask)
        return (num + net_hash_mix(net)) & mask;
 }
 
+enum {
+       UDP_FLAGS_CORK,         /* Cork is required */
+};
+
 struct udp_sock {
        /* inet_sock has to be the first member */
        struct inet_sock inet;
 #define udp_port_hash          inet.sk.__sk_common.skc_u16hashes[0]
 #define udp_portaddr_hash      inet.sk.__sk_common.skc_u16hashes[1]
 #define udp_portaddr_node      inet.sk.__sk_common.skc_portaddr_node
+
+       unsigned long    udp_flags;
+
        int              pending;       /* Any pending frames ? */
-       unsigned int     corkflag;      /* Cork is required */
        __u8             encap_type;    /* Is this an Encapsulation socket? */
        unsigned char    no_check6_tx:1,/* Send zero UDP6 checksums on TX? */
                         no_check6_rx:1,/* Allow zero UDP6 checksums on RX? */
@@ -51,6 +57,11 @@ struct udp_sock {
                         gro_enabled:1, /* Request GRO aggregation */
                         accept_udp_l4:1,
                         accept_udp_fraglist:1;
+/* indicator bits used by pcflag: */
+#define UDPLITE_BIT      0x1           /* set by udplite proto init function */
+#define UDPLITE_SEND_CC  0x2           /* set via udplite setsockopt         */
+#define UDPLITE_RECV_CC  0x4           /* set via udplite setsocktopt        */
+       __u8             pcflag;        /* marks socket as UDP-Lite if > 0    */
        /*
         * Following member retains the information to create a UDP header
         * when the socket is uncorked.
@@ -62,12 +73,6 @@ struct udp_sock {
         */
        __u16            pcslen;
        __u16            pcrlen;
-/* indicator bits used by pcflag: */
-#define UDPLITE_BIT      0x1           /* set by udplite proto init function */
-#define UDPLITE_SEND_CC  0x2           /* set via udplite setsockopt         */
-#define UDPLITE_RECV_CC  0x4           /* set via udplite setsocktopt        */
-       __u8             pcflag;        /* marks socket as UDP-Lite if > 0    */
-       __u8             unused[3];
        /*
         * For encapsulation sockets.
         */
@@ -95,6 +100,15 @@ struct udp_sock {
        int             forward_threshold;
 };
 
+#define udp_test_bit(nr, sk)                   \
+       test_bit(UDP_FLAGS_##nr, &udp_sk(sk)->udp_flags)
+#define udp_set_bit(nr, sk)                    \
+       set_bit(UDP_FLAGS_##nr, &udp_sk(sk)->udp_flags)
+#define udp_clear_bit(nr, sk)                  \
+       clear_bit(UDP_FLAGS_##nr, &udp_sk(sk)->udp_flags)
+#define udp_assign_bit(nr, sk, val)            \
+       assign_bit(UDP_FLAGS_##nr, &udp_sk(sk)->udp_flags, val)
+
 #define UDP_MAX_SEGMENTS       (1 << 6UL)
 
 #define udp_sk(ptr) container_of_const(ptr, struct udp_sock, inet.sk)