From 53fc41a856da4a23fa603bd5a274d819e7a3b54e Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Wed, 28 Oct 2009 18:24:33 +0000 Subject: [PATCH] Move PMTU header block to top of file 1206e7538be86f073b21cd289266286b60a95d0a added linux/errqueue.h to rx_user.c, but added the include in the middle of a function - which means that the new structure is out of scope for the rest of the file, which breaks the build on Linux. Put the header include at the start with all of its other friends. Cc: Alf Wachsmann Change-Id: Id932ff63b59e6cd62eda3df4f01e4eef354736ca Reviewed-on: http://gerrit.openafs.org/748 Tested-by: Derrick Brashear Reviewed-by: Derrick Brashear --- src/rx/rx_user.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c index 4f331e44e6..05164576f8 100644 --- a/src/rx/rx_user.c +++ b/src/rx/rx_user.c @@ -46,6 +46,14 @@ #define IPPORT_USERRESERVED 5000 # endif +#if defined(HAVE_LINUX_ERRQUEUE_H) && defined(ADAPT_PMTU) +#include +#include +#ifndef IP_MTU +#define IP_MTU 14 +#endif +#endif + #ifndef AFS_NT40_ENV # include #endif @@ -103,13 +111,6 @@ rxi_GetHostUDPSocket(u_int ahost, u_short port) int pmtu=IP_PMTUDISC_DONT; #endif #endif -#if defined(HAVE_LINUX_ERRQUEUE_H) && defined(ADAPT_PMTU) -#include -#include -#ifndef IP_MTU -#define IP_MTU 14 -#endif -#endif #if !defined(AFS_NT40_ENV) if (ntohs(port) >= IPPORT_RESERVED && ntohs(port) < IPPORT_USERRESERVED) {