From 34b49ab5c74f29c3d8fafb6d0b0915777ad6ba58 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Wed, 23 May 2012 21:30:05 +0200
Subject: [PATCH] kernel: Remove some bogus casts to the own type.

---
 sys/dev/netif/mii_layer/mlphy.c | 2 +-
 sys/dev/netif/msk/if_msk.c      | 3 +--
 sys/dev/netif/ndis/if_ndis.c    | 2 +-
 sys/dev/netif/sn/if_sn.c        | 3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sys/dev/netif/mii_layer/mlphy.c b/sys/dev/netif/mii_layer/mlphy.c
index 12f65ec650..0ad3c86a78 100644
--- a/sys/dev/netif/mii_layer/mlphy.c
+++ b/sys/dev/netif/mii_layer/mlphy.c
@@ -198,7 +198,7 @@ mlphy_service(struct mii_softc *xsc, struct mii_data *mii, int cmd)
 	int			reg;
 	struct mii_softc	*other = NULL;
 	struct mlphy_softc	*msc = (struct mlphy_softc *)xsc;
-	struct mii_softc	*sc = (struct mii_softc *)&msc->ml_mii;
+	struct mii_softc	*sc = &msc->ml_mii;
 	device_t		*devlist;
 	int			devs, i;
 	const struct mii_media	*mm;
diff --git a/sys/dev/netif/msk/if_msk.c b/sys/dev/netif/msk/if_msk.c
index 25a48b7a05..ce2eb9def3 100644
--- a/sys/dev/netif/msk/if_msk.c
+++ b/sys/dev/netif/msk/if_msk.c
@@ -782,8 +782,7 @@ msk_jumbo_newbuf(struct msk_if_softc *sc_if, int idx)
 		return (ENOBUFS);
 	}
 	/* Attach the buffer to the mbuf. */
-	MEXTADD(m, buf, MSK_JLEN, msk_jfree, (struct msk_if_softc *)sc_if, 0,
-	    EXT_NET_DRV);
+	MEXTADD(m, buf, MSK_JLEN, msk_jfree, sc_if, 0, EXT_NET_DRV);
 	if ((m->m_flags & M_EXT) == 0) {
 		m_freem(m);
 		return (ENOBUFS);
diff --git a/sys/dev/netif/ndis/if_ndis.c b/sys/dev/netif/ndis/if_ndis.c
index cebba88c5e..ff0eb44ee6 100644
--- a/sys/dev/netif/ndis/if_ndis.c
+++ b/sys/dev/netif/ndis/if_ndis.c
@@ -3214,7 +3214,7 @@ ndis_scan_results(struct ndis_softc *sc)
 			wb->nwbx_supportedrates[j] & 0x7f;
 		}
 		rates[1] = j;
-		sp.ssid = (uint8_t *)&ssid[0];
+		sp.ssid = &ssid[0];
 		memcpy(sp.ssid + 2, &wb->nwbx_ssid.ns_ssid,
 		    wb->nwbx_ssid.ns_ssidlen);
 		sp.ssid[1] = wb->nwbx_ssid.ns_ssidlen;
diff --git a/sys/dev/netif/sn/if_sn.c b/sys/dev/netif/sn/if_sn.c
index 9d9f878a4e..c7224660e1 100644
--- a/sys/dev/netif/sn/if_sn.c
+++ b/sys/dev/netif/sn/if_sn.c
@@ -29,7 +29,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *   $FreeBSD: src/sys/dev/sn/if_sn.c,v 1.7.2.3 2001/02/04 04:38:38 toshi Exp $
- *   $DragonFly: src/sys/dev/netif/sn/if_sn.c,v 1.29 2008/08/17 04:32:34 sephe Exp $
  */
 
 /*
@@ -1372,7 +1371,7 @@ sn_getmcf(struct arpcom *ac, u_char *mcf)
 {
 	int i;
 	u_int index, index2;
-	u_char *af = (u_char *) mcf;
+	u_char *af = mcf;
 	struct ifmultiaddr *ifma;
 
 	bzero(mcf, MCFSZ);
-- 
2.41.0