diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2015-09-11 13:02:29 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2015-09-11 13:02:29 +0000 |
| commit | 60446fe20a75a96e4e90d49e026768a4a5de327e (patch) | |
| tree | 4df36879019283b812826de0f68df84379613b0f /sys/dev/pci/if_oce.c | |
| parent | 39d4e265d62cc7fb7ea6c2dfa113f7e47cb3a730 (diff) | |
Make room for media types of the future. Extend the ifmedia word to 64 bits.
This changes numbers of the SIOCSIFMEDIA and SIOCGIFMEDIA ioctls and
grows struct ifmediareq.
Old ifconfig and dhclient binaries can still assign addresses, however
the 'media' subcommand stops working. Recompiling ifconfig and dhclient
with new headers before a reboot should not be necessary unless in very
special circumstances where non-default media settings must be used to
get link and console access is not available.
There may be some MD fallout but that will be cleared up later.
ok deraadt miod
with help and suggestions from several sharks attending l2k15
Diffstat (limited to 'sys/dev/pci/if_oce.c')
| -rw-r--r-- | sys/dev/pci/if_oce.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/if_oce.c b/sys/dev/pci/if_oce.c index 3da3b451c66..4bf67e5e1bb 100644 --- a/sys/dev/pci/if_oce.c +++ b/sys/dev/pci/if_oce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_oce.c,v 1.85 2015/06/29 18:58:04 mikeb Exp $ */ +/* $OpenBSD: if_oce.c,v 1.86 2015/09/11 13:02:28 stsp Exp $ */ /* * Copyright (c) 2012 Mike Belopuhov @@ -322,7 +322,7 @@ struct oce_softc { struct ifmedia sc_media; ushort sc_link_up; ushort sc_link_speed; - uint sc_fc; + uint64_t sc_fc; struct oce_dma_mem sc_mbx; struct oce_dma_mem sc_pld; @@ -472,7 +472,7 @@ int oce_check_native_mode(struct oce_softc *); int oce_create_iface(struct oce_softc *, uint8_t *macaddr); int oce_config_vlan(struct oce_softc *, struct normal_vlan *vtags, int nvtags, int untagged, int promisc); -int oce_set_flow_control(struct oce_softc *, uint flags); +int oce_set_flow_control(struct oce_softc *, uint64_t); int oce_config_rss(struct oce_softc *, int enable); int oce_update_mcast(struct oce_softc *, uint8_t multi[][ETHER_ADDR_LEN], int naddr); @@ -3032,7 +3032,7 @@ oce_config_vlan(struct oce_softc *sc, struct normal_vlan *vtags, int nvtags, * @returns 0 on success, EIO on failure */ int -oce_set_flow_control(struct oce_softc *sc, uint flags) +oce_set_flow_control(struct oce_softc *sc, uint64_t flags) { struct mbx_common_get_set_flow_control cmd; int err; |