From owner-svn-src-head@FreeBSD.ORG Wed Jul 3 21:45:30 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 85C33542; Wed, 3 Jul 2013 21:45:30 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6846F1A37; Wed, 3 Jul 2013 21:45:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r63LjUbq028513; Wed, 3 Jul 2013 21:45:30 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r63LjTLt028507; Wed, 3 Jul 2013 21:45:29 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201307032145.r63LjTLt028507@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Wed, 3 Jul 2013 21:45:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r252614 - head/sbin/dhclient X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jul 2013 21:45:30 -0000 Author: pjd Date: Wed Jul 3 21:45:29 2013 New Revision: 252614 URL: http://svnweb.freebsd.org/changeset/base/252614 Log: MFp4 @229470: Remove unused argument from send_packet(). Reviewed by: brooks Sponsored by: The FreeBSD Foundation Modified: head/sbin/dhclient/bpf.c head/sbin/dhclient/dhclient.c head/sbin/dhclient/dhcpd.h Modified: head/sbin/dhclient/bpf.c ============================================================================== --- head/sbin/dhclient/bpf.c Wed Jul 3 21:43:41 2013 (r252613) +++ head/sbin/dhclient/bpf.c Wed Jul 3 21:45:29 2013 (r252614) @@ -251,8 +251,7 @@ if_register_receive(struct interface_inf ssize_t send_packet(struct interface_info *interface, struct dhcp_packet *raw, - size_t len, struct in_addr from, struct sockaddr_in *to, - struct hardware *hto) + size_t len, struct in_addr from, struct sockaddr_in *to) { unsigned char buf[256]; struct iovec iov[2]; @@ -261,7 +260,7 @@ send_packet(struct interface_info *inter /* Assemble the headers... */ if (to->sin_addr.s_addr == INADDR_BROADCAST) - assemble_hw_header(interface, buf, &bufp, hto); + assemble_hw_header(interface, buf, &bufp, NULL); assemble_udp_ip_header(buf, &bufp, from.s_addr, to->sin_addr.s_addr, to->sin_port, (unsigned char *)raw, len); Modified: head/sbin/dhclient/dhclient.c ============================================================================== --- head/sbin/dhclient/dhclient.c Wed Jul 3 21:43:41 2013 (r252613) +++ head/sbin/dhclient/dhclient.c Wed Jul 3 21:45:29 2013 (r252614) @@ -1232,7 +1232,7 @@ again: /* Send out a packet. */ (void)send_packet(ip, &ip->client->packet, ip->client->packet_length, - inaddr_any, &sockaddr_broadcast, NULL); + inaddr_any, &sockaddr_broadcast); add_timeout(cur_time + ip->client->interval, send_discover, ip); } @@ -1463,7 +1463,7 @@ cancel: /* Send out a packet. */ (void) send_packet(ip, &ip->client->packet, ip->client->packet_length, - from, &destination, NULL); + from, &destination); add_timeout(cur_time + ip->client->interval, send_request, ip); } @@ -1479,7 +1479,7 @@ send_decline(void *ipp) /* Send out a packet. */ (void) send_packet(ip, &ip->client->packet, ip->client->packet_length, - inaddr_any, &sockaddr_broadcast, NULL); + inaddr_any, &sockaddr_broadcast); } void Modified: head/sbin/dhclient/dhcpd.h ============================================================================== --- head/sbin/dhclient/dhcpd.h Wed Jul 3 21:43:41 2013 (r252613) +++ head/sbin/dhclient/dhcpd.h Wed Jul 3 21:45:29 2013 (r252614) @@ -301,7 +301,7 @@ int if_register_bpf(struct interface_inf void if_register_send(struct interface_info *); void if_register_receive(struct interface_info *); ssize_t send_packet(struct interface_info *, struct dhcp_packet *, size_t, - struct in_addr, struct sockaddr_in *, struct hardware *); + struct in_addr, struct sockaddr_in *); ssize_t receive_packet(struct interface_info *, unsigned char *, size_t, struct sockaddr_in *, struct hardware *);