diff --git a/src/core/raw.c b/src/core/raw.c
index 69c3da0a..8f1e609d 100644
--- a/src/core/raw.c
+++ b/src/core/raw.c
@@ -112,7 +112,7 @@ raw_input(struct pbuf *p, struct netif *inp)
 #if IP_SOF_BROADCAST_RECV
       /* broadcast filter? */
       if ((ip_get_option(pcb, SOF_BROADCAST) || !ip_addr_isbroadcast(ip_current_dest_addr(), ip_current_netif()))
-          || PCB_ISIPV6(pcb)
+          || IP_IS_V6_VAL(pcb->local_ip)
           )
 #endif /* IP_SOF_BROADCAST_RECV */
       {
diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c
index d7dbad85..ae43fd2b 100644
--- a/src/core/tcp_in.c
+++ b/src/core/tcp_in.c
@@ -598,7 +598,7 @@ tcp_listen_input(struct tcp_pcb_listen *pcb)
 
 #if TCP_CALCULATE_EFF_SEND_MSS
     npcb->mss = tcp_eff_send_mss(npcb->mss, &npcb->local_ip,
-      &npcb->remote_ip, PCB_ISIPV6(npcb));
+      &npcb->remote_ip, IP_IS_V6_VAL(npcb->remote_ip));
 #endif /* TCP_CALCULATE_EFF_SEND_MSS */
 
     MIB2_STATS_INC(mib2.tcppassiveopens);