mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-24 07:31:41 +00:00
[UDP]: Revert udplite and code split.
This reverts commitdb1ed684f6
("[IPV6] UDP: Rename IPv6 UDP files."), commit8be8af8fa4
("[IPV4] UDP: Move IPv4-specific bits to other file.") and commite898d4db27
("[UDP]: Allow users to configure UDP-Lite."). First, udplite is of such small cost, and it is a core protocol just like TCP and normal UDP are. We spent enormous amounts of effort to make udplite share as much code with core UDP as possible. All of that work is less valuable if we're just going to slap a config option on udplite support. It is also causing build failures, as reported on linux-next, showing that the changeset was not tested very well. In fact, this is the second build failure resulting from the udplite change. Finally, the config options provided was a bool, instead of a modular option. Meaning the udplite code does not even get build tested by allmodconfig builds, and furthermore the user is not presented with a reasonable modular build option which is particularly needed by distribution vendors. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
ba0fa45994
commit
db8dac20d5
17 changed files with 1101 additions and 1222 deletions
|
@ -70,10 +70,8 @@ struct udp_sock {
|
|||
#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 */
|
||||
#ifdef CONFIG_IP_UDPLITE
|
||||
__u8 pcflag; /* marks socket as UDP-Lite if > 0 */
|
||||
__u8 unused[3];
|
||||
#endif
|
||||
/*
|
||||
* For encapsulation sockets.
|
||||
*/
|
||||
|
@ -85,15 +83,7 @@ static inline struct udp_sock *udp_sk(const struct sock *sk)
|
|||
return (struct udp_sock *)sk;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_IP_UDPLITE
|
||||
#define IS_UDPLITE(__sk) (udp_sk(__sk)->pcflag)
|
||||
#define IS_PROTO_UDPLITE(__proto) ((__proto) == IPPROTO_UDPLITE)
|
||||
#define IS_SOL_UDPFAMILY(level) ((level) == SOL_UDP || (level) == SOL_UDPLITE)
|
||||
#else
|
||||
#define IS_UDPLITE(__sk) 0
|
||||
#define IS_PROTO_UDPLITE(__proto) 0
|
||||
#define IS_SOL_UDPFAMILY(level) ((level) == SOL_UDP)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue