Commit 356d054a authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

ipv4: Unmask upper DSCP bits in get_rttos() 



The function is used by a few socket types to retrieve the TOS value
with which to perform the FIB lookup for packets sent through the socket
(flowi4_tos). If a DS field was passed using the IP_TOS control message,
then it is used. Otherwise the one specified via the IP_TOS socket
option.

Unmask the upper DSCP bits so that in the future the lookup could be
performed according to the full DSCP value.

Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Reviewed-by: default avatarGuillaume Nault <gnault@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ff95cb5e

include/net/ip.h

+4 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <net/flow_dissector.h>

#include <net/netns/hash.h>

#include <net/lwtunnel.h>

#include <net/inet_dscp.h>



#define IPV4_MAX_PMTU		65535U		/* RFC 2675, Section 5.1 */

#define IPV4_MIN_MTU		68			/* RFC 791 */
@@ -258,7 +259,9 @@ static inline u8 ip_sendmsg_scope(const struct inet_sock *inet, 


static inline __u8 get_rttos(struct ipcm_cookie* ipc, struct inet_sock *inet)

{

	return (ipc->tos != -1) ? RT_TOS(ipc->tos) : RT_TOS(READ_ONCE(inet->tos));

	u8 dsfield = ipc->tos != -1 ? ipc->tos : READ_ONCE(inet->tos);



	return dsfield & INET_DSCP_MASK;

}



/* datagram.c */