Commit 310afe86 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

[NET]: include/linux/udp.h - remove duplicate include 



Remove duplicate #include <linux/types.h>
Combine #ifdef __KERNEL__ blocks

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cc32e054

include/linux/udp.h

+7 −11
Original line number Diff line number Diff line
@@ -26,15 +26,6 @@ struct udphdr { 
	__sum16	check;

};



#ifdef __KERNEL__

#include <linux/skbuff.h>



static inline struct udphdr *udp_hdr(const struct sk_buff *skb)

{

	return (struct udphdr *)skb_transport_header(skb);

}

#endif



/* UDP socket options */

#define UDP_CORK	1	/* Never send partially complete segments */

#define UDP_ENCAP	100	/* Set the socket to accept encapsulated packets */
@@ -45,9 +36,14 @@ static inline struct udphdr *udp_hdr(const struct sk_buff *skb) 
#define UDP_ENCAP_L2TPINUDP	3 /* rfc2661 */



#ifdef __KERNEL__

#include <linux/types.h>



#include <net/inet_sock.h>

#include <linux/skbuff.h>



static inline struct udphdr *udp_hdr(const struct sk_buff *skb)

{

	return (struct udphdr *)skb_transport_header(skb);

}



#define UDP_HTABLE_SIZE		128



struct udp_sock {