Skip to content

Commit

Permalink
netinet: fix merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@fichtner
fichtner committed Jan 3, 2022
1 parent 0ed6186 commit cf33d04
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions sys/netinet/ip_fastfwd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -464,15 +464,9 @@ ip_tryforward(struct mbuf *m)

/* Handle redirect case. */
redest.s_addr = 0;
<<<<<<< HEAD
if (V_ipsendredirects && (nifp == m->m_pkthdr.rcvif) &&
gw->sa_family == AF_INET)
mcopy = ip_redir_alloc(m, nh, ip, &redest.s_addr);
=======
if (V_ipsendredirects && osrc.s_addr == ip->ip_src.s_addr &&
nh->nh_ifp == m->m_pkthdr.rcvif)
nifp == m->m_pkthdr.rcvif)
mcopy = ip_redir_alloc(m, nh, ip_len, &osrc, &redest);
>>>>>>> upstream/stable/13

/*
* Check if packet fits MTU or if hardware will fragment for us
Expand Down

0 comments on commit cf33d04

Please sign in to comment.