From owner-svn-src-projects@FreeBSD.ORG Thu Jan 22 23:45:40 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 3F99A757;
Thu, 22 Jan 2015 23:45:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 2AD4F893;
Thu, 22 Jan 2015 23:45:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0MNjeHi087739;
Thu, 22 Jan 2015 23:45:40 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0MNjcKU087728;
Thu, 22 Jan 2015 23:45:38 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201501222345.t0MNjcKU087728@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 22 Jan 2015 23:45:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r277540 - in projects/ifnet/sys: dev/bge dev/msk dev/xl
net
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jan 2015 23:45:40 -0000
Author: glebius
Date: Thu Jan 22 23:45:38 2015
New Revision: 277540
URL: https://svnweb.freebsd.org/changeset/base/277540
Log:
Substitute if_set(ifp, IF_BAUDRATE, ...) with if_setbaudrate(ifp).
Modified:
projects/ifnet/sys/dev/bge/if_bge.c
projects/ifnet/sys/dev/msk/if_msk.c
projects/ifnet/sys/dev/xl/if_xl.c
projects/ifnet/sys/net/if.c
projects/ifnet/sys/net/if.h
Modified: projects/ifnet/sys/dev/bge/if_bge.c
==============================================================================
--- projects/ifnet/sys/dev/bge/if_bge.c Thu Jan 22 22:04:43 2015 (r277539)
+++ projects/ifnet/sys/dev/bge/if_bge.c Thu Jan 22 23:45:38 2015 (r277540)
@@ -1285,7 +1285,7 @@ bge_miibus_statchg(device_t dev)
sc->bge_link = 0;
if (sc->bge_ifp != NULL) {
- if_set(sc->bge_ifp, IF_BAUDRATE,
+ if_setbaudrate(sc->bge_ifp,
ifmedia_baudrate(mii->mii_media_active));
if_link_state_change(sc->bge_ifp,
ifmedia_link_state(mii->mii_media_status));
Modified: projects/ifnet/sys/dev/msk/if_msk.c
==============================================================================
--- projects/ifnet/sys/dev/msk/if_msk.c Thu Jan 22 22:04:43 2015 (r277539)
+++ projects/ifnet/sys/dev/msk/if_msk.c Thu Jan 22 23:45:38 2015 (r277540)
@@ -581,7 +581,7 @@ msk_miibus_statchg(device_t dev)
GMAC_READ_2(sc, sc_if->msk_port, GM_GP_CTRL);
}
}
- if_set(ifp, IF_BAUDRATE, ifmedia_baudrate(mii->mii_media_active));
+ if_setbaudrate(ifp, ifmedia_baudrate(mii->mii_media_active));
if_link_state_change(ifp, ifmedia_link_state(mii->mii_media_status));
}
Modified: projects/ifnet/sys/dev/xl/if_xl.c
==============================================================================
--- projects/ifnet/sys/dev/xl/if_xl.c Thu Jan 22 22:04:43 2015 (r277539)
+++ projects/ifnet/sys/dev/xl/if_xl.c Thu Jan 22 23:45:38 2015 (r277540)
@@ -478,7 +478,7 @@ xl_miibus_statchg(device_t dev)
}
CSR_WRITE_1(sc, XL_W3_MAC_CTRL, macctl);
if (sc->xl_ifp != NULL) {
- if_set(sc->xl_ifp, IF_BAUDRATE,
+ if_setbaudrate(sc->xl_ifp,
ifmedia_baudrate(mii->mii_media_active));
if_link_state_change(sc->xl_ifp,
ifmedia_link_state(mii->mii_media_status));
Modified: projects/ifnet/sys/net/if.c
==============================================================================
--- projects/ifnet/sys/net/if.c Thu Jan 22 22:04:43 2015 (r277539)
+++ projects/ifnet/sys/net/if.c Thu Jan 22 23:45:38 2015 (r277540)
@@ -1528,9 +1528,6 @@ if_getfeature(if_t ifp, ift_feature f, u
*ptr = NULL;
switch (f) {
- case IF_BAUDRATE:
- *f64 = &ifp->if_baudrate;
- break;
case IF_DRIVER_SOFTC:
*ptr = ifp->if_softc;
break;
@@ -1660,6 +1657,16 @@ if_inc_txcounters(struct ifnet *ifp, str
}
/*
+ * Set the baudrate.
+ */
+void
+if_setbaudrate(struct ifnet *ifp, uint64_t baudrate)
+{
+
+ ifp->if_baudrate = baudrate;
+}
+
+/*
* Copy data from ifnet to userland API structure if_data.
*/
void
Modified: projects/ifnet/sys/net/if.h
==============================================================================
--- projects/ifnet/sys/net/if.h Thu Jan 22 22:04:43 2015 (r277539)
+++ projects/ifnet/sys/net/if.h Thu Jan 22 23:45:38 2015 (r277540)
@@ -575,9 +575,6 @@ typedef enum {
} ift_counter;
typedef enum {
- /* uint64_t */
- IF_BAUDRATE,
- /* pointers */
IF_DRIVER_SOFTC,
IF_LLADDR,
IF_BPF,
@@ -717,6 +714,7 @@ void if_detach(if_t);
void if_mtap(if_t, struct mbuf *, void *, u_int);
void if_inc_counter(if_t, ift_counter, int64_t);
void if_inc_txcounters(if_t, struct mbuf *);
+void if_setbaudrate(if_t, uint64_t);
void if_link_state_change(if_t, int);
void if_set(if_t, ift_feature, uint64_t);
void * if_getsoftc(if_t, ift_feature);