Messages in this thread Patch in this message | | | Subject | [PATCH] include/linux/udp.h - remove duplicate include | From | Joe Perches <> | Date | Sun, 09 Mar 2008 16:55:45 -0700 |
| |
Remove duplicate #include <linux/types.h> Combine #ifdef __KERNEL__ blocks
Signed-off-by: Joe Perches <joe@perches.com>
include/linux/udp.h | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/include/linux/udp.h b/include/linux/udp.h index 8ec703f..d3730a8 100644 --- a/include/linux/udp.h +++ b/include/linux/udp.h @@ -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 {
| |