diff options
| author | glebius <glebius@FreeBSD.org> | 2013-04-26 12:50:32 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2013-04-26 12:50:32 +0000 |
| commit | b4bc270e8f6757fa385861750ab22ba0ca4978ed (patch) | |
| tree | 073e97431b8851637e702226bc02446cb01b0f4b /sys/netgraph | |
| parent | 7eab2144525c38723764e418181b36c7e9cbafad (diff) | |
| download | FreeBSD-src-b4bc270e8f6757fa385861750ab22ba0ca4978ed.zip FreeBSD-src-b4bc270e8f6757fa385861750ab22ba0ca4978ed.tar.gz | |
Add const qualifier to the dst parameter of the ifnet if_output method.
Diffstat (limited to 'sys/netgraph')
| -rw-r--r-- | sys/netgraph/ng_fec.c | 6 | ||||
| -rw-r--r-- | sys/netgraph/ng_iface.c | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sys/netgraph/ng_fec.c b/sys/netgraph/ng_fec.c index 459931a..b7c1f56 100644 --- a/sys/netgraph/ng_fec.c +++ b/sys/netgraph/ng_fec.c @@ -165,7 +165,7 @@ struct ng_fec_bundle { int fec_btype; int (*fec_if_output) (struct ifnet *, struct mbuf *, - struct sockaddr *, + const struct sockaddr *, struct route *); }; @@ -198,7 +198,7 @@ static int ng_fec_ifmedia_upd(struct ifnet *ifp); static void ng_fec_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr); static int ng_fec_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data); static int ng_fec_output(struct ifnet *ifp, struct mbuf *m0, - struct sockaddr *dst, struct route *ro); + const struct sockaddr *dst, struct route *ro); static void ng_fec_tick(void *arg); static int ng_fec_addport(struct ng_fec_private *priv, char *iface); static int ng_fec_delport(struct ng_fec_private *priv, char *iface); @@ -923,7 +923,7 @@ ng_fec_input(struct ifnet *ifp, struct mbuf *m0) static int ng_fec_output(struct ifnet *ifp, struct mbuf *m, - struct sockaddr *dst, struct route *ro) + const struct sockaddr *dst, struct route *ro) { const priv_p priv = (priv_p) ifp->if_softc; struct ng_fec_bundle *b; diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c index 5e6f12f..e6ac508 100644 --- a/sys/netgraph/ng_iface.c +++ b/sys/netgraph/ng_iface.c @@ -123,7 +123,7 @@ typedef struct ng_iface_private *priv_p; static void ng_iface_start(struct ifnet *ifp); static int ng_iface_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data); static int ng_iface_output(struct ifnet *ifp, struct mbuf *m0, - struct sockaddr *dst, struct route *ro); + const struct sockaddr *dst, struct route *ro); static void ng_iface_bpftap(struct ifnet *ifp, struct mbuf *m, sa_family_t family); static int ng_iface_send(struct ifnet *ifp, struct mbuf *m, @@ -353,7 +353,7 @@ ng_iface_ioctl(struct ifnet *ifp, u_long command, caddr_t data) static int ng_iface_output(struct ifnet *ifp, struct mbuf *m, - struct sockaddr *dst, struct route *ro) + const struct sockaddr *dst, struct route *ro) { struct m_tag *mtag; uint32_t af; @@ -385,13 +385,13 @@ ng_iface_output(struct ifnet *ifp, struct mbuf *m, m_tag_prepend(m, mtag); /* BPF writes need to be handled specially. */ - if (dst->sa_family == AF_UNSPEC) { + if (dst->sa_family == AF_UNSPEC) bcopy(dst->sa_data, &af, sizeof(af)); - dst->sa_family = af; - } + else + af = dst->sa_family; /* Berkeley packet filter */ - ng_iface_bpftap(ifp, m, dst->sa_family); + ng_iface_bpftap(ifp, m, af); if (ALTQ_IS_ENABLED(&ifp->if_snd)) { M_PREPEND(m, sizeof(sa_family_t), M_NOWAIT); @@ -402,10 +402,10 @@ ng_iface_output(struct ifnet *ifp, struct mbuf *m, ifp->if_oerrors++; return (ENOBUFS); } - *(sa_family_t *)m->m_data = dst->sa_family; + *(sa_family_t *)m->m_data = af; error = (ifp->if_transmit)(ifp, m); } else - error = ng_iface_send(ifp, m, dst->sa_family); + error = ng_iface_send(ifp, m, af); return (error); } |
