| Message ID | c52dbc1c0d22703c5c194e8ab990dbb97e4dcad2.1732720980.git.lorenzo.bianconi@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev,branch-23.09] controller: Remove leftover check in pinctrl_handle_put_dhcp_opts(). | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/github-robot-_ovn-kubernetes | fail | github build: failed |
On 11/27/24 4:27 PM, Lorenzo Bianconi wrote: > Remove leftover check in pinctrl_handle_put_dhcp_opts() routine to allow > unicast DHCP discover packets. > > Fixes: faeb96968492 ("Reduce number of DHCP responder flows for LSPs") > Fixes: b267acd6f5f4 ("controller: Accept unicast dhcp-discover in pinctrl_handle_put_dhcp_opts().") > > Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> > --- Thanks, Lorenzo, for fixing this wrong backport! Applied to 23.09. Regards, Dumitru > controller/pinctrl.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/controller/pinctrl.c b/controller/pinctrl.c > index bd241721d..9e80556ef 100644 > --- a/controller/pinctrl.c > +++ b/controller/pinctrl.c > @@ -2053,11 +2053,6 @@ pinctrl_handle_put_dhcp_opts( > switch (*in_dhcp_msg_type) { > case DHCP_MSG_DISCOVER: > msg_type = DHCP_MSG_OFFER; > - if (in_flow->nw_dst != htonl(INADDR_BROADCAST)) { > - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); > - VLOG_WARN_RL(&rl, "DHCP DISCOVER must be Broadcast"); > - goto exit; > - } > break; > case DHCP_MSG_REQUEST: { > msg_type = DHCP_MSG_ACK;
diff --git a/controller/pinctrl.c b/controller/pinctrl.c index bd241721d..9e80556ef 100644 --- a/controller/pinctrl.c +++ b/controller/pinctrl.c @@ -2053,11 +2053,6 @@ pinctrl_handle_put_dhcp_opts( switch (*in_dhcp_msg_type) { case DHCP_MSG_DISCOVER: msg_type = DHCP_MSG_OFFER; - if (in_flow->nw_dst != htonl(INADDR_BROADCAST)) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - VLOG_WARN_RL(&rl, "DHCP DISCOVER must be Broadcast"); - goto exit; - } break; case DHCP_MSG_REQUEST: { msg_type = DHCP_MSG_ACK;
Remove leftover check in pinctrl_handle_put_dhcp_opts() routine to allow unicast DHCP discover packets. Fixes: faeb96968492 ("Reduce number of DHCP responder flows for LSPs") Fixes: b267acd6f5f4 ("controller: Accept unicast dhcp-discover in pinctrl_handle_put_dhcp_opts().") Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> --- controller/pinctrl.c | 5 ----- 1 file changed, 5 deletions(-)