From a3759e0af8717f478a32420b8c8d125fae15cd25 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Wed, 1 Aug 2012 14:57:06 -0400 Subject: [PATCH] rx: Remove ADAPT_MTU and MISCMTU Ever since 5bcf626ddaf92e199c4b46c11ad276013a47db52, ADAPT_MTU has been unconditionally defined. MISCMTU has always been unconditionally defined, and not used anywhere. Remove both of these, assuming they are always defined. Note that ADAPT_MTU != ADAPT_PMTU. Change-Id: Ie870bde8f84e59e1fe2a09806d8b68936d15f65e Reviewed-on: http://gerrit.openafs.org/7922 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/afs/afs_server.c | 2 -- src/rx/rx_kcommon.c | 25 ++++++++++--------------- src/rx/rx_misc.h | 3 --- src/rx/rx_user.c | 5 ----- src/viced/callback.c | 4 ---- 5 files changed, 10 insertions(+), 29 deletions(-) diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c index 76be5a15a7..4d5f68c675 100644 --- a/src/afs/afs_server.c +++ b/src/afs/afs_server.c @@ -1283,9 +1283,7 @@ afs_SetServerPrefs(struct srvAddr *sa) return; } sa->sa_iprank = 0; -#ifdef ADAPT_MTU ifn = rxi_FindIfnet(sa->sa_ip, &ifad); -#endif if (ifn) { /* local, more or less */ #ifdef IFF_LOOPBACK if (ifn->if_flags & IFF_LOOPBACK) { diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c index 110ba60103..68310a3ab5 100644 --- a/src/rx/rx_kcommon.c +++ b/src/rx/rx_kcommon.c @@ -365,9 +365,8 @@ rxi_InitPeerParams(struct rx_peer *pp) { u_short rxmtu; -#ifdef ADAPT_MTU -# ifndef AFS_SUN5_ENV -# ifdef AFS_USERSPACE_IP_ADDR +#ifndef AFS_SUN5_ENV +# ifdef AFS_USERSPACE_IP_ADDR afs_int32 i; afs_int32 mtu; @@ -387,25 +386,25 @@ rxi_InitPeerParams(struct rx_peer *pp) pp->ifMTU = rxmtu; } } -# else /* AFS_USERSPACE_IP_ADDR */ +# else /* AFS_USERSPACE_IP_ADDR */ rx_ifnet_t ifn; -# if !defined(AFS_SGI62_ENV) +# if !defined(AFS_SGI62_ENV) if (numMyNetAddrs == 0) (void)rxi_GetIFInfo(); -# endif +# endif ifn = rxi_FindIfnet(pp->host, NULL); if (ifn) { rx_rto_setPeerTimeoutSecs(pp, 2); pp->ifMTU = MIN(RX_MAX_PACKET_SIZE, rx_MyMaxSendSize); -# ifdef IFF_POINTOPOINT +# ifdef IFF_POINTOPOINT if (rx_ifnet_flags(ifn) & IFF_POINTOPOINT) { /* wish we knew the bit rate and the chunk size, sigh. */ rx_rto_setPeerTimeoutSecs(pp, 4); pp->ifMTU = RX_PP_PACKET_SIZE; } -# endif /* IFF_POINTOPOINT */ +# endif /* IFF_POINTOPOINT */ /* Diminish the packet size to one based on the MTU given by * the interface. */ if (rx_ifnet_mtu(ifn) > (RX_IPUDP_SIZE + RX_HEADER_SIZE)) { @@ -417,8 +416,8 @@ rxi_InitPeerParams(struct rx_peer *pp) rx_rto_setPeerTimeoutSecs(pp, 3); pp->ifMTU = MIN(RX_REMOTE_PACKET_SIZE, rx_MyMaxSendSize); } -# endif /* else AFS_USERSPACE_IP_ADDR */ -# else /* AFS_SUN5_ENV */ +# endif /* else AFS_USERSPACE_IP_ADDR */ +#else /* AFS_SUN5_ENV */ afs_int32 mtu; mtu = rxi_FindIfMTU(pp->host); @@ -438,11 +437,7 @@ rxi_InitPeerParams(struct rx_peer *pp) pp->ifMTU = rxmtu; } } -# endif /* AFS_SUN5_ENV */ -#else /* ADAPT_MTU */ - rx_rto_setPeerTimeoutSecs(pp, 2); - pp->ifMTU = OLD_MAX_PACKET_SIZE; -#endif /* else ADAPT_MTU */ +#endif /* AFS_SUN5_ENV */ pp->ifMTU = rxi_AdjustIfMTU(pp->ifMTU); pp->maxMTU = OLD_MAX_PACKET_SIZE; /* for compatibility with old guys */ pp->natMTU = MIN(pp->ifMTU, OLD_MAX_PACKET_SIZE); diff --git a/src/rx/rx_misc.h b/src/rx/rx_misc.h index 30493e389e..912194fa7a 100644 --- a/src/rx/rx_misc.h +++ b/src/rx/rx_misc.h @@ -14,9 +14,6 @@ #ifndef _RX_MISC_H_ #define _RX_MISC_H_ -#define MISCMTU -#define ADAPT_MTU - #if defined(AFS_SUN5_ENV) #include #include diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c index aa85c2613b..b52f6bddc7 100644 --- a/src/rx/rx_user.c +++ b/src/rx/rx_user.c @@ -685,7 +685,6 @@ rxi_InitPeerParams(struct rx_peer *pp) UNLOCK_IF_INIT; } -#ifdef ADAPT_MTU /* try to second-guess IP, and identify which link is most likely to * be used for traffic to/from this host. */ ppaddr = ntohl(pp->host); @@ -716,10 +715,6 @@ rxi_InitPeerParams(struct rx_peer *pp) rx_rto_setPeerTimeoutSecs(pp, 3); pp->ifMTU = MIN(rx_MyMaxSendSize, RX_REMOTE_PACKET_SIZE); } -#else /* ADAPT_MTU */ - rx_rto_setPeerTimeoutSecs(pp, 2); - pp->ifMTU = MIN(rx_MyMaxSendSize, OLD_MAX_PACKET_SIZE); -#endif /* ADAPT_MTU */ #if defined(ADAPT_PMTU) && defined(IP_MTU) sock=socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); if (sock != OSI_NULLSOCKET) { diff --git a/src/viced/callback.c b/src/viced/callback.c index b6e33733e5..53cea3a135 100644 --- a/src/viced/callback.c +++ b/src/viced/callback.c @@ -457,10 +457,8 @@ XCallBackBulk_r(struct host * ahost, struct AFSFid * fids, afs_int32 nfids) int j; struct rx_connection *cb_conn = NULL; -#ifdef ADAPT_MTU rx_SetConnDeadTime(ahost->callback_rxcon, 4); rx_SetConnHardDeadTime(ahost->callback_rxcon, AFS_HARDDEADTIME); -#endif code = 0; j = 0; @@ -694,10 +692,8 @@ MultiBreakCallBack_r(struct cbstruct cba[], int ncbas, multi_to_cba_map[j] = i; conns[j++] = thishost->callback_rxcon; -#ifdef ADAPT_MTU rx_SetConnDeadTime(thishost->callback_rxcon, 4); rx_SetConnHardDeadTime(thishost->callback_rxcon, AFS_HARDDEADTIME); -#endif } if (j) { /* who knows what multi would do with 0 conns? */