soundwire: bus: introduce controller_id

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

diff --git a/include/linux/udp.h b/include/linux/udp.h
index 43c1fb2..d041887 100644 (file)
--- a/include/linux/udp.h
+++ b/include/linux/udp.h
@@ -32,25 +32,30 @@ 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 */
+       UDP_FLAGS_NO_CHECK6_TX, /* Send zero UDP6 checksums on TX? */
+       UDP_FLAGS_NO_CHECK6_RX, /* Allow zero UDP6 checksums on RX? */
+       UDP_FLAGS_GRO_ENABLED,  /* Request GRO aggregation */
+       UDP_FLAGS_ACCEPT_FRAGLIST,
+       UDP_FLAGS_ACCEPT_L4,
+       UDP_FLAGS_ENCAP_ENABLED, /* This socket enabled encap */
+       UDP_FLAGS_UDPLITE_SEND_CC, /* set via udplite setsockopt */
+       UDP_FLAGS_UDPLITE_RECV_CC, /* set via udplite setsockopt */
+};
+
 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? */
-                        encap_enabled:1, /* This socket enabled encap
-                                          * processing; UDP tunnels and
-                                          * different encapsulation layer set
-                                          * this
-                                          */
-                        gro_enabled:1, /* Request GRO aggregation */
-                        accept_udp_l4:1,
-                        accept_udp_fraglist:1;
+
        /*
         * Following member retains the information to create a UDP header
         * when the socket is uncorked.
@@ -62,12 +67,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,28 +94,39 @@ 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_test_and_set_bit(nr, sk)           \
+       test_and_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)
 
 static inline void udp_set_no_check6_tx(struct sock *sk, bool val)
 {
-       udp_sk(sk)->no_check6_tx = val;
+       udp_assign_bit(NO_CHECK6_TX, sk, val);
 }
 
 static inline void udp_set_no_check6_rx(struct sock *sk, bool val)
 {
-       udp_sk(sk)->no_check6_rx = val;
+       udp_assign_bit(NO_CHECK6_RX, sk, val);
 }
 
-static inline bool udp_get_no_check6_tx(struct sock *sk)
+static inline bool udp_get_no_check6_tx(const struct sock *sk)
 {
-       return udp_sk(sk)->no_check6_tx;
+       return udp_test_bit(NO_CHECK6_TX, sk);
 }
 
-static inline bool udp_get_no_check6_rx(struct sock *sk)
+static inline bool udp_get_no_check6_rx(const struct sock *sk)
 {
-       return udp_sk(sk)->no_check6_rx;
+       return udp_test_bit(NO_CHECK6_RX, sk);
 }
 
 static inline void udp_cmsg_recv(struct msghdr *msg, struct sock *sk,
@@ -135,10 +145,12 @@ static inline bool udp_unexpected_gso(struct sock *sk, struct sk_buff *skb)
        if (!skb_is_gso(skb))
                return false;
 
-       if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4 && !udp_sk(sk)->accept_udp_l4)
+       if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4 &&
+           !udp_test_bit(ACCEPT_L4, sk))
                return true;
 
-       if (skb_shinfo(skb)->gso_type & SKB_GSO_FRAGLIST && !udp_sk(sk)->accept_udp_fraglist)
+       if (skb_shinfo(skb)->gso_type & SKB_GSO_FRAGLIST &&
+           !udp_test_bit(ACCEPT_FRAGLIST, sk))
                return true;
 
        return false;
@@ -146,8 +158,8 @@ static inline bool udp_unexpected_gso(struct sock *sk, struct sk_buff *skb)
 
 static inline void udp_allow_gso(struct sock *sk)
 {
-       udp_sk(sk)->accept_udp_l4 = 1;
-       udp_sk(sk)->accept_udp_fraglist = 1;
+       udp_set_bit(ACCEPT_L4, sk);
+       udp_set_bit(ACCEPT_FRAGLIST, sk);
 }
 
 #define udp_portaddr_for_each_entry(__sk, list) \